tonyair
/
silverstripe-reports
mirror of https://github.com/silverstripe/silverstripe-reports
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
silverstripe-reports/templates
History
Damian Mooyman 0d736d0f3e Merge remote-tracking branch 'silverstripe-cms/3.1' into 3.2 
Conflicts:
	.gitignore
	.travis.yml
	README.md
	_config.php
	composer.json
	javascript/ReportAdmin.js
	templates/Includes/ReportAdmin_Content.ss
	templates/ReportAdminForm.ss
 		2015-11-03 11:11:58 +13:00
..
Includes Merge remote-tracking branch 'silverstripe-cms/3.1' into 3.2 2015-11-03 11:11:58 +13:00
ReportAdminForm.ss Updated templates to be more consistent and removed trailing spaces 2013-07-18 13:14:29 +02:00