Merge 3 into master

This commit is contained in:
Damian Mooyman 2016-05-18 17:30:22 +12:00
commit ea4333fec6

View File

@ -8,4 +8,6 @@ After:
# See http://doc.silverstripe.org/framework/en/topics/configuration # See http://doc.silverstripe.org/framework/en/topics/configuration
# Caution: Indentation through two spaces, not tabs # Caution: Indentation through two spaces, not tabs
SSViewer: SSViewer:
theme: 'simple' theme: 'simple'
Debug:
friendly_error_httpcode: true