Tim Nagel f6df88cc67 Merge branch 'master' into pr/744 ... Conflicts: Command/PopulateCommand.php		2015-03-11 14:11:18 +11:00
..
config	Merge branch 'master' into pr/744	2015-03-11 14:11:18 +11:00
doc	Merge pull request #794 from merk/property-paths	2015-03-10 21:58:32 +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