Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

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

Snippets Groups Projects

02af298d

Commit 02af298d authored 8 years ago by Dominik Hebeler

Downloads
- Plain Diff

Merge branch 'development' into 'master'

Development



See merge request !144

parents c6f6c9f9 0e2e5dce

No related branches found

No related tags found

1 merge request!1365Resolve "Filter Options for MetaGer"

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

public/js/scriptStartPage.js 0 additions, 11 deletions

public/js/scriptStartPage.js
resources/views/datenschutz.blade.php 0 additions, 4 deletions

resources/views/datenschutz.blade.php
resources/views/layouts/staticPages.blade.php 1 addition, 8 deletions

resources/views/layouts/staticPages.blade.php
storage/app/public/_ads.txt 0 additions, 8 deletions

storage/app/public/_ads.txt
storage/app/public/ads.txt 4 additions, 3 deletions

storage/app/public/ads.txt

with 5 additions and 34 deletions

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