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

..

Activity.php

Merge branch '3.8'

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

Export.php

Merge branch '3.8'

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

Informations.php

Merge branch '3.8'

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

Root.php

Merge branch '3.8'

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