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

Conflicts:
	templates/web/report/report_layout_child.html.twig

2014-02-13 11:12:26 +01:00

..

Admin

Use short array declarations

2014-02-11 18:44:31 +01:00

Api

Merge branch '3.8'

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

Client

Merge branch '3.8'

2014-02-05 19:42:22 +01:00

Prod

Fix CS

2014-02-11 16:27:47 +01:00

Report

Merge branch '3.8'

2014-02-13 11:12:26 +01:00

Root

Fix CS

2014-02-11 16:27:47 +01:00

Thesaurus

Merge branch '3.8'

2014-02-11 09:02:29 +01:00

User

Merge branch '3.8'

2014-02-05 19:42:22 +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

Fix latest merge

2014-02-04 20:41:22 +01:00

Exception.php

Merge branch '3.8'

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

Lightbox.php

Merge branch '3.8'

2014-02-05 19:42:22 +01:00

Minifier.php

Merge branch '3.8'

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

Permalink.php

Use short array declarations

2014-02-11 18:44:31 +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