Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

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

Snippets Groups Projects

fc31e73e

Commit fc31e73e authored 7 years ago by Dominik Hebeler

Downloads
- Plain Diff

Merge branch 'development' into 'master'

Development

See merge request !1043

parents d1581fed e094e06b

No related branches found

No related tags found

Loading

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

resources/assets/js/scriptStartPage.js 29 additions, 1 deletion

resources/assets/js/scriptStartPage.js
resources/assets/less/metager/static-pages.less 0 additions, 12 deletions

resources/assets/less/metager/static-pages.less
resources/lang/de/staticPages.php 0 additions, 11 deletions

resources/lang/de/staticPages.php
resources/lang/en/staticPages.php 0 additions, 11 deletions

resources/lang/en/staticPages.php
resources/lang/fr/staticPages.php 0 additions, 10 deletions

resources/lang/fr/staticPages.php
resources/views/layouts/resultPage.blade.php 0 additions, 5 deletions

resources/views/layouts/resultPage.blade.php
resources/views/layouts/staticPages.blade.php 0 additions, 36 deletions

resources/views/layouts/staticPages.blade.php

with 29 additions and 86 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