Merge pull request github#1378 from rafaelstz/patch-4

Setup of the development environment.
ggcespia · Jan 22, 2015 · 77e1463 · 77e1463
2 parents 0232b30 + cd72caa
commit 77e1463
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/Magento.gitignore b/Magento.gitignore
@@ -1,3 +1,4 @@
+.htaccess.sample
 .modgit/
 .modman/
 app/code/community/Phoenix/