mirror of
https://github.com/silverstripe/silverstripe-installer
synced 2024-10-22 17:05:33 +02:00
Merge branch '3.1' into 3.2
This commit is contained in:
commit
0572ce7a9a
19
.gitignore
vendored
19
.gitignore
vendored
@ -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
4
assets/.gitignore
vendored
Normal file
@ -0,0 +1,4 @@
|
||||
# Ignore sensible defaults
|
||||
/*/
|
||||
/error-*.html
|
||||
/_combinedfiles/
|
Loading…
Reference in New Issue
Block a user