Tim Nagel 5b88baeca6 Merge branch 'pr/744' ... Conflicts: CHANGELOG-3.1.md Command/PopulateCommand.php		2015-03-11 22:17:14 +11:00
..
config	Merge branch 'pr/744'	2015-03-11 22:17:14 +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