Nicolas Le Goff 45679d8675 Merge branch '3.8' ...

Conflicts:
	lib/Alchemy/Phrasea/Controller/Admin/Databox.php
	lib/classes/collection.php
	templates/web/admin/databox/databox.html.twig

2014-01-14 12:38:58 +01:00

..

Collection.php

Merge branch '3.8'

2014-01-06 15:38:14 +01:00

ConnectedUsers.php

Merge branch '3.8'

2014-01-06 15:38:14 +01:00

Dashboard.php

Merge branch '3.8'

2014-01-06 15:38:14 +01:00

Databox.php

Merge branch '3.8'

2014-01-14 12:38:58 +01:00

Databoxes.php

Merge branch '3.8'

2014-01-06 15:38:14 +01:00

Fields.php

Merge branch '3.8'

2014-01-06 15:38:14 +01:00

Publications.php

Merge branch '3.8'

2014-01-06 15:38:14 +01:00

Root.php

Merge branch '3.8'

2014-01-06 15:38:14 +01:00

SearchEngine.php

Merge branch '3.8'

2014-01-06 15:38:14 +01:00

Setup.php

Merge branch '3.8'

2014-01-06 15:38:14 +01:00

Subdefs.php

Merge branch '3.8'

2014-01-06 15:38:14 +01:00

TaskManager.php

Bump copyright year

2014-01-06 15:40:56 +01:00

Users.php

Merge branch '3.8'

2014-01-06 15:38:14 +01:00