Romain Neutron 0fa375b9bc Merge branch '3.8' ...

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

2013-10-18 15:01:47 +02:00

..

answers.html.twig

Use url generator everywhere

2013-06-13 09:44:16 +02:00

baskets.html.twig

Use url generator everywhere

2013-06-13 09:44:16 +02:00

help.html.twig

Refactor client

2013-01-28 14:09:49 +01:00

home_inter_pub_basket.html.twig

Fixed RSSFeeds bug for php 5.3, fixed Aggregate->getEntries() called without any feed

2013-09-05 13:44:05 +02:00

index.html.twig

Merge branch '3.8'

2013-10-18 15:01:47 +02:00