Tim Nagel 3d69c08b5a Merge branch 'master' into pr/725 ... Conflicts: Doctrine/AbstractProvider.php		2015-03-11 15:47:03 +11:00
..
config	Merge branch 'master' into pr/725	2015-03-11 15:47:03 +11: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