Merge branch '3.2' into 3

This commit is contained in:
Daniel Hensby 2015-11-10 10:55:06 +00:00
commit 0f0e4e85a5
2 changed files with 14 additions and 9 deletions

19
.gitignore vendored
View File

@ -1,10 +1,11 @@
assets/*
# ignore cache folder
/silverstripe-cache/
# ignore all environment files
_ss_environment.php
tools/phing-metadata
silverstripe-cache
.buildpath
.project
.settings
.idea
.DS_Store
vendor/
# ignore build tools
/tools/phing-metadata
# ignore composer vendor folder
/vendor/

4
assets/.gitignore vendored Normal file
View File

@ -0,0 +1,4 @@
# Ignore sensible defaults
/*/
/error-*.html
/_combinedfiles/