2 Commits

Author	SHA1	Message	Date
Damian Mooyman	d7d6fd8758	Merge 3 into master ... # Conflicts: # code/controllers/CMSPageAddController.php # code/model/ErrorPage.php # composer.json # css/screen.css # tests/behat/features/insert-a-link.feature	2016-04-29 14:34:29 +12:00
Ingo Schommer	e4861bdc79	Adjust file paths for new static file structure in framework	2016-04-20 21:13:20 +12:00