Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

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

Snippets Groups Projects

22e96d83

Commit 22e96d83 authored 8 years ago by Dominik Hebeler

Downloads
- Plain Diff

Merge branch 'development' into 'master'

Development



See merge request !283

parents 11518395 7d20edca

No related branches found

No related tags found

Loading

Changes 5
Pipelines 1

Hide whitespace changes

Inline Side-by-side

Showing

app/Models/parserSkripte/Fastbot.php 2 additions, 1 deletion

app/Models/parserSkripte/Fastbot.php
resources/lang/de/partnershops.php 1 addition, 1 deletion

resources/lang/de/partnershops.php
resources/lang/de/results.php 5 additions, 0 deletions

resources/lang/de/results.php
resources/lang/en/partnershops.php 1 addition, 1 deletion

resources/lang/en/partnershops.php
resources/lang/en/results.php 5 additions, 0 deletions

resources/lang/en/results.php

with 14 additions and 3 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