Romain Neutron a805c94524 Merge branch '3.8' ...

Conflicts:
	composer.json
	composer.lock
	lib/classes/task/Scheduler.php

2013-10-21 19:05:37 +02:00

..

analytics.html.twig

Remove providers instanciation in Twig setup

2012-10-04 15:44:48 +02:00

index.html.twig

Merge branch '3.8'

2013-10-21 19:05:37 +02:00

thumbnail.html.twig

Fix #1497 Resizing images is not working on tablet in paysage mode

2013-10-18 16:11:54 +02:00