Simon Welsh b497b8f548 Merge remote-tracking branch 'origin/3.1' ... Conflicts: .travis.yml code/reports/Report.php		2014-03-18 09:23:39 +13:00
..
behat	Assets table just shows the name, not the path	2014-03-18 08:56:41 +13:00
controller	FIX: Fix failover to index template in ContentController::getViewer()	2014-02-14 17:44:53 +13:00
model	Merge remote-tracking branch 'origin/3.1'	2014-03-18 09:23:39 +13:00
reports	Merge remote-tracking branch 'origin/3.1'	2013-03-26 10:58:07 +01:00
search	Merge pull request #927 from halkyon/cmsmainsearch_test_fix	2014-01-16 16:45:00 -08:00
tasks	API Marked statics private, use Config API instead (#8317)	2013-03-24 17:21:04 +01:00
templates	getViewer will now locate and use the correct templates for pages which don't have their own controller	2013-12-20 20:52:11 +00:00