Merge branch 'master' of https://github.com/Requarks/wiki

2017-05-30 21:23:42 -04:00
parent 2e3504f32b 8278f8571b
commit f1a516da03
24 changed files with 182 additions and 89 deletions
--- a/server/locales/en/browser.json
+++ b/server/locales/en/browser.json
@@ -66,4 +66,4 @@
    "nomatch": "No results matching your query",
    "didyoumean": "Did you mean...?"
  }
-}
+}