diff options
| author | Mike Greiling <mike@pixelcog.com> | 2018-09-28 18:33:41 +0000 |
|---|---|---|
| committer | Mike Greiling <mike@pixelcog.com> | 2018-09-28 18:33:41 +0000 |
| commit | cb1e4a8abb33a32da9bec300e0259d50fa2afea9 (patch) | |
| tree | c4fdd4076025bb5b612bc88debab62709c311e5f /vendor/gitignore/CraftCMS.gitignore | |
| parent | 2a6e33d838caa813e248de6af603201f5addb7eb (diff) | |
| parent | d5734de3d60983fcb3d3f3099d47fe9831e453ad (diff) | |
| download | gitlab-ce-cb1e4a8abb33a32da9bec300e0259d50fa2afea9.tar.gz | |
Merge branch 'master' into 'remove-dropzonejs-rails'
# Conflicts:
# Gemfile.lock
Diffstat (limited to 'vendor/gitignore/CraftCMS.gitignore')
| -rw-r--r-- | vendor/gitignore/CraftCMS.gitignore | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/vendor/gitignore/CraftCMS.gitignore b/vendor/gitignore/CraftCMS.gitignore index a70d4772c46..0d81b397e35 100644 --- a/vendor/gitignore/CraftCMS.gitignore +++ b/vendor/gitignore/CraftCMS.gitignore @@ -1,3 +1,4 @@ -# Craft Storage (cache) [http://buildwithcraft.com/help/craft-storage-gitignore] +# Craft 2 Storage (https://craftcms.com/support/craft-storage-gitignore) +# not necessary for Craft 3 (https://github.com/craftcms/craft/issues/26) /craft/storage/* -!/craft/storage/logo/*
\ No newline at end of file +!/craft/storage/rebrand |