Merge pull request #1964 from alchemy-fr/4.0

Merge 4.0 into master
2025-10-23 09:53:15 +00:00 · 2016-09-29 09:32:30 +02:00
parent e11cd249af 8f99a69add
commit 9597a775e2
13 changed files with 67 additions and 18 deletions
--- a/lib/conf.d/configuration.yml
+++ b/lib/conf.d/configuration.yml
@@ -6,7 +6,6 @@ main:
    maintenance: false
    key: ''
    api_require_ssl: true
-    api_disabled: true
    database:
        host: 'sql-host'
        port: 3306