merging upstream changes

This commit is contained in:
Patrick Rauland
2013-11-08 13:54:35 -06:00
68 changed files with 499 additions and 345 deletions

12
WordPress.gitignore Normal file
View File

@@ -0,0 +1,12 @@
.htaccess
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