Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

MetaGer
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Incidents

Snippets Groups Projects

6f24d240

Commit 6f24d240 authored 8 years ago by Dominik Hebeler

Downloads
- Plain Diff

Merge branch '165-seite-zur-erklarung-der-partnershops-fehlt' into 'development'

Erklärung der Partnershops eingebaut

Closes #165

See merge request !234

parents 64779806 083e83ce

No related branches found

No related tags found

Loading

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

app/Http/routes.php 7 additions, 0 deletions

app/Http/routes.php
public/css/partnershops.css 0 additions, 0 deletions

public/css/partnershops.css
resources/lang/de/partnershops.php 22 additions, 0 deletions

resources/lang/de/partnershops.php
resources/lang/de/titles.php 1 addition, 0 deletions

resources/lang/de/titles.php
resources/lang/en/titles.php 1 addition, 0 deletions

resources/lang/en/titles.php
resources/views/layouts/result.blade.php 1 addition, 1 deletion

resources/views/layouts/result.blade.php
resources/views/spende/partnershops.blade.php 11 additions, 0 deletions

resources/views/spende/partnershops.blade.php

with 43 additions and 1 deletion

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment