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 branch 'master' into elastic-indexer

Browse Source 
Conflicts:
	bin/console
This commit is contained in:
Mathieu Darse
2014-10-15 12:18:44 +02:00
parent e88a219cb6 85102bfce7
commit 5b24664001
70 changed files with 2573 additions and 2251 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
config/configuration.sample.yml
View File

@@ -204,8 +204,12 @@ api_cors:
max_age: 0
hosts: []
session:
idle: 0
lifetime: 604800 # 1 week
idle: 0
lifetime: 604800 # 1 week
static-file:
enabled: false
type: nginx
symlink-directory: ''
crossdomain:
site-control: 'master-only'
allow-access-from: