Christophe Coevoet c013ed9657 Merge branch '3.0.x' into 3.1.x ... Conflicts: Resources/config/orm.xml		2015-03-12 17:49:25 +01:00
..
config	Merge branch '3.0.x' into 3.1.x	2015-03-12 17:49:25 +01:00
doc	Merge pull request #728 from ugomeda/master	2015-03-11 15:33:03 +11:00
meta	Update LICENSE	2013-09-15 09:17:13 +02:00
views/Collector	Built-in templates use a base64 encoded image for the toolbar	2015-01-04 19:49:25 +11:00