Nicolas Le Goff 4cae02aed3 Merge branch '3.8' ...

Conflicts:
	lib/classes/module/console/schedulerStart.php
	lib/classes/module/console/taskrun.php

2014-02-04 17:25:40 +01:00

..

Admin

Fix CS

2014-01-30 19:56:05 +01:00

Api

Merge branch '3.8'

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

Client

Make search engine a real service

2014-01-07 16:45:58 +01:00

Prod

Add subdef substituer

2014-01-14 15:05:44 +01:00

Report

Merge branch '3.8'

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

Root

Merge branch '3.8'

2014-02-04 11:30:23 +01:00

Thesaurus

Merge branch '3.8'

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

User

Merge branch '3.8'

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

Utils

Merge branch '3.8'

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

AbstractDelivery.php

Merge branch '3.8'

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

Datafiles.php

Merge branch '3.8'

2014-02-04 11:25:59 +01:00

Exception.php

Merge branch '3.8'

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

Lightbox.php

Merge branch '3.8'

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

Minifier.php

Merge branch '3.8'

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

Permalink.php

Merge branch '3.8'

2014-02-04 17:25:40 +01:00

RecordsRequest.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