Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

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

Snippets Groups Projects

acd61028

Commit acd61028 authored 8 years ago by Karl

Downloads
- Plain Diff

Merge branch 'development' into 363-spanische-version-vorbereiten

parents e6a22c65 f75c3f01

No related branches found

No related tags found

Loading

Changes 5

Expand all Hide whitespace changes

Inline Side-by-side

Showing

app/Models/parserSkripte/BASE.php 43 additions, 1 deletion

app/Models/parserSkripte/BASE.php
composer.lock 299 additions, 288 deletions

composer.lock
resources/lang/de/index.php 10 additions, 1 deletion

resources/lang/de/index.php
resources/lang/fr/index.php 4 additions, 0 deletions

resources/lang/fr/index.php
resources/views/index.blade.php 26 additions, 8 deletions

resources/views/index.blade.php

with 382 additions and 298 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