Merge pull request #978 from davidalger/feature/media-wysiwyg-ignore-…

…rule Added ignore rule for media assets in wysiwyg directory.
magento · Jan 20, 2015 · 7e40b69 · 7e40b69
2 parents bce7e15 + 83eb12a
commit 7e40b69
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/.gitignore b/.gitignore
@@ -32,6 +32,8 @@ atlassian*
 /pub/media/theme/*
 /pub/media/theme_customization/*
 !/pub/media/theme_customization/.htaccess
+/pub/media/wysiwyg/*
+!/pub/media/wysiwyg/.htaccess
 /pub/media/tmp/*
 !/pub/media/tmp/.htaccess
 /pub/static/*