Merge branch 4.0 into master

2025-10-23 09:53:15 +00:00 · 2016-05-25 17:21:08 +02:00
parent b96917f908 a57d2bb3e1
commit 1917b3dba3
71 changed files with 4409 additions and 2685 deletions
--- a/config/configuration.sample.yml
+++ b/config/configuration.sample.yml
@@ -6,6 +6,7 @@ main:
    maintenance: false
    languages: []
    key: ''
+    api_require_ssl: true
    database:
        host: 127.0.0.1
        port: 3306