Nicolas Le Goff bd1e4516bd Merge branch '3.8' ...

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

2014-02-03 19:02:22 +01:00

..

custom_files

Added some empty repo

2011-12-07 19:52:47 +01:00

minilogos

Added some empty repo

2011-12-07 19:52:47 +01:00

personnalisation_sample

V 3.5 RC 1

2011-12-05 00:23:28 +01:00

stamp

Add empty repositories

2011-12-12 16:30:37 +01:00

status

Added some empty repo

2011-12-07 19:52:47 +01:00

templates

Adding some folders

2011-12-07 17:42:08 +01:00

topics

Add empty repositories

2011-12-12 16:30:37 +01:00

wm

Add empty repositories

2011-12-12 16:30:37 +01:00

configuration.sample.yml

Merge branch '3.8'

2014-02-03 19:02:22 +01:00