From: Patrick Rauland <bftrick@gmail.com>
Date: Fri, 8 Nov 2013 19:54:35 +0000 (-0600)
Subject: merging upstream changes
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=1f4bf1f36d8eae503aeb7f169ffafcad7bff9acc;p=gitignore.git

merging upstream changes
---

1f4bf1f36d8eae503aeb7f169ffafcad7bff9acc
diff --cc WordPress.gitignore
index 00000000,7194a5b9..8e22e0e2
mode 000000,100644..100644
--- a/WordPress.gitignore
+++ b/WordPress.gitignore
@@@ -1,0 -1,13 +1,12 @@@
+ .htaccess
 -wp-config.php
+ wp-content/uploads/
+ wp-content/blogs.dir/
+ wp-content/upgrade/
+ wp-content/backup-db/
+ wp-content/advanced-cache.php
+ wp-content/wp-cache-config.php
+ sitemap.xml
+ *.log
+ wp-content/cache/
+ wp-content/backups/
+ sitemap.xml.gz