Merge branch 'development' into 'master' (26988b81) · Commits · open-source / MetaGer · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

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

Snippets Groups Projects

26988b81

Commit 26988b81 authored 8 years ago by Dominik Hebeler

Downloads
- Plain Diff

Merge branch 'development' into 'master'

Development



See merge request !113

parents 67fad995 dc9604ee

No related branches found

No related tags found

Loading

Changes 5
Pipelines 1

Hide whitespace changes

Inline Side-by-side

Showing

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

public/js/scriptStartPage.js
resources/views/datenschutz.blade.php 11 additions, 2 deletions

resources/views/datenschutz.blade.php
resources/views/layouts/staticPages.blade.php 7 additions, 0 deletions

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

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

storage/app/public/ads.txt

with 41 additions and 13 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