mirror of https://github.com/github/gitignore
Merge remote branch 'upstream/master'
* upstream/master: These should go into other gitignores, like Vim.gitignore Added Wordpress (Forgot to 'git add .') Added Vim >= 7.3 persistent undo files Added few files to OSX.gitignore Conflicts: Global/OSX.gitignore
This commit is contained in:
commit
fef6ee31cb
|
@ -1 +1,2 @@
|
|||
.*.sw[a-z]
|
||||
*.un~
|
||||
|
|
|
@ -0,0 +1,3 @@
|
|||
.htaccess
|
||||
wp-config.php
|
||||
wp-content/uploads/
|
Loading…
Reference in New Issue