Skip to content
Snippets Groups Projects
Commit 8a1024ca authored by Karl Hasselbring's avatar Karl Hasselbring
Browse files

Merge with Development

parents a74ca60e df946518
No related branches found
No related tags found
1 merge request!1365Resolve "Filter Options for MetaGer"
Hide whitespace changes
Inline Side-by-side
app/Models/Quicktips/Quicktips.php
+ 0
− 1
View file @ 8a1024ca
...@@ -12,7 +12,6 @@ class Quicktips ...@@ -12,7 +12,6 @@ class Quicktips
{ {
use DispatchesJobs; use DispatchesJobs;
//const QUICKTIP_URL = "https://quicktips.metager3.de/1.1.0/quicktips.xml";
const QUICKTIP_URL = "http://localhost:63825/1.1.0/quicktips.xml"; const QUICKTIP_URL = "http://localhost:63825/1.1.0/quicktips.xml";
const QUICKTIP_NAME = "quicktips"; const QUICKTIP_NAME = "quicktips";
const CACHE_DURATION = 60; const CACHE_DURATION = 60;
......
resources/lang/de/index.php
+ 2
− 2
View file @ 8a1024ca
...@@ -41,8 +41,8 @@ return [ ...@@ -41,8 +41,8 @@ return [
'about.3.1' => '', 'about.3.1' => '',
'lang.tooltip' => 'Ergebnissprache wählen', 'lang.tooltip' => 'Ergebnissprache wählen',
'key.placeholder' => 'Mitglieder Key eingeben', 'key.placeholder' => 'Mitglieder-Key eingeben',
'key.tooltip' => 'Mitglieder Key eingeben', 'key.tooltip' => 'Mitglieder-Key eingeben',
'placeholder' => 'MetaGer: Sicher suchen & finden, Privatsphäre schützen', 'placeholder' => 'MetaGer: Sicher suchen & finden, Privatsphäre schützen',
'plugin.open-modal' => 'MetaGer-Plugin hinzufügen', 'plugin.open-modal' => 'MetaGer-Plugin hinzufügen',
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment