Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

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

Snippets Groups Projects

792c5311

Commit 792c5311 authored 8 years ago by Dominik Hebeler

Downloads
- Plain Diff

Merge branch 'development' into 'master'

Development



See merge request !277

parents 5bfde904 878667a5

No related branches found

No related tags found

Loading

Changes 7
Pipelines 1

Hide whitespace changes

Inline Side-by-side

Showing

deploy/Homestead.yaml 0 additions, 34 deletions

deploy/Homestead.yaml
deploy/checkServerStatus.sh 0 additions, 48 deletions

deploy/checkServerStatus.sh
public/img/Firefox.png 0 additions, 0 deletions

public/img/Firefox.png
public/img/Firefox_Standard.png 0 additions, 0 deletions

public/img/Firefox_Standard.png
resources/lang/de/index.php 2 additions, 5 deletions

resources/lang/de/index.php
resources/lang/en/index.php 2 additions, 5 deletions

resources/lang/en/index.php
resources/views/index.blade.php 2 additions, 3 deletions

resources/views/index.blade.php

with 6 additions and 95 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