Merge pull request #1378 from rafaelstz/patch-4

arcresu · arcresu · commit 77e1463e48c4 · 2015-01-22T14:15:49.000+11:00
Setup of the development environment.
diff --git a/Magento.gitignore b/Magento.gitignore
@@ -1,3 +1,4 @@
+.htaccess.sample
 .modgit/
 .modman/
 app/code/community/Phoenix/
