Commit Graph

3 Commits

Author SHA1 Message Date
Daniel Hensby
f55b22bd75 Merge branch '3.1' into 3.2
Conflicts:
	CONTRIBUTING.md
	code/reports/BrokenLinksReport.php
	code/reports/SideReport.php
	tests/model/RedirectorPageTest.php
	tests/reports/ReportTest.php
2015-07-20 11:09:29 +01:00
Ingo Schommer
8eb3840325 Merge remote-tracking branch 'origin/3.1'
Conflicts:
	code/controllers/ReportAdmin.php
	code/reports/Report.php
	tests/reports/CmsReportsTest.php
2013-03-26 10:58:07 +01:00
Will Rossiter
56346a50bf API: moved reports API to separate module 2013-01-17 21:58:03 +13:00