Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

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

Snippets Groups Projects

acc2b4ed

Commit acc2b4ed authored 8 years ago by Phil Höfer

Downloads
- Plain Diff

Merge branch 'development' into 'master'

Development



See merge request !427

parents 0ee74ca4 caf96256

No related branches found

No related tags found

4 merge requests!1061Development,!1046Patch,!444Merge mit Master,!427Development

Changes 7
Pipelines 1

Hide whitespace changes

Inline Side-by-side

Showing

app/Http/Controllers/MetaGerSearch.php 23 additions, 11 deletions

app/Http/Controllers/MetaGerSearch.php
app/Models/parserSkripte/Radiobrowser.php 62 additions, 0 deletions

app/Models/parserSkripte/Radiobrowser.php
index.php 0 additions, 37 deletions

index.php
resources/lang/de/plugin.php 5 additions, 0 deletions

resources/lang/de/plugin.php
resources/lang/de/tips.php 27 additions, 1 deletion

resources/lang/de/tips.php
resources/lang/es/index.php 46 additions, 9 deletions

resources/lang/es/index.php
resources/views/plugin.blade.php 1 addition, 1 deletion

resources/views/plugin.blade.php

with 164 additions and 59 deletions

Loading

Dominik Hebeler @dominik
mentioned in commit 6fd6d7af
· 8 years ago

mentioned in commit 6fd6d7af

mentioned in commit 6fd6d7aff8085a20f3ef79c3abce1b592fa13462

Toggle commit list

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