Merge branch 'revert-acc2b4ed' into 'development' (6fd6d7af) · Commits · open-source / MetaGer · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

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

Snippets Groups Projects

6fd6d7af

Commit 6fd6d7af authored 8 years ago by Dominik Hebeler

Downloads
- Plain Diff

Merge branch 'revert-acc2b4ed' into 'development'

Revert "Merge branch 'development' into 'master'"

This reverts merge request !427

See merge request !428

parents caf96256 6ab61131

No related branches found

No related tags found

Loading

Changes 7
Pipelines 1

Hide whitespace changes

Inline Side-by-side

Showing

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

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

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

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

resources/lang/de/plugin.php
resources/lang/de/tips.php 1 addition, 27 deletions

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

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

resources/views/plugin.blade.php

with 59 additions and 164 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