hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-23 09:53:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1964 from alchemy-fr/4.0

Browse Source 
Merge 4.0 into master
This commit is contained in:
Thibaud Fabre
2016-09-29 09:32:30 +02:00
committed by GitHub
parent e11cd249af 8f99a69add
commit 9597a775e2
13 changed files with 67 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
config/configuration.sample.yml
View File

@@ -7,7 +7,6 @@ main:
languages: []
key: ''
api_require_ssl: true
api_disabled: true
database:
host: 127.0.0.1
port: 3306