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 '3.8'

Browse Source 
Conflicts:
	config/configuration.sample.yml
	lib/Alchemy/Phrasea/Core/Version.php
	lib/classes/module/console/schedulerStart.php
	lib/classes/module/console/taskrun.php
	lib/conf.d/configuration.yml
	templates/mobile/common/index.html.twig
This commit is contained in:
Nicolas Le Goff
2014-02-03 19:02:22 +01:00
parent 0369a4eaf4 fc1bec4816
commit bd1e4516bd
15 changed files with 222 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
config/configuration.sample.yml
View File

@@ -28,6 +28,11 @@ main:
search-engine:
type: Alchemy\Phrasea\SearchEngine\Phrasea\PhraseaEngine
options: []
task-manager:
logger:
max-files: 10
enabled: true
level: INFO
session:
type: 'file'
options: []