Merge branch 'development' into 'master'
Development See merge request !1597
Showing
- app/Http/Controllers/MailController.php 7 additions, 4 deletionsapp/Http/Controllers/MailController.php
- app/Http/Controllers/MetaGerSearch.php 8 additions, 1 deletionapp/Http/Controllers/MetaGerSearch.php
- app/Http/Controllers/SettingsController.php 24 additions, 0 deletionsapp/Http/Controllers/SettingsController.php
- app/MetaGer.php 10 additions, 10 deletionsapp/MetaGer.php
- app/Models/Quicktips/Quicktips.php 4 additions, 4 deletionsapp/Models/Quicktips/Quicktips.php
- init.sh 6 additions, 3 deletionsinit.sh
- resources/js/scriptSettings.js 3 additions, 4 deletionsresources/js/scriptSettings.js
- resources/lang/de/kontakt.php 3 additions, 1 deletionresources/lang/de/kontakt.php
- resources/lang/en/kontakt.php 3 additions, 1 deletionresources/lang/en/kontakt.php
- resources/lang/es/kontakt.php 3 additions, 1 deletionresources/lang/es/kontakt.php
- resources/lang/es/plugin-page.php 1 addition, 1 deletionresources/lang/es/plugin-page.php
- resources/less/metager/pages/resultpage/result-page.less 1 addition, 0 deletionsresources/less/metager/pages/resultpage/result-page.less
- resources/views/kontakt/kontakt.blade.php 5 additions, 1 deletionresources/views/kontakt/kontakt.blade.php
- resources/views/settings/index.blade.php 17 additions, 0 deletionsresources/views/settings/index.blade.php
- routes/cookie.php 1 addition, 0 deletionsroutes/cookie.php
Loading
Please register or sign in to comment