Merge branch 'master' of git.tt-rss.org:fox/tt-rss

[tt-rss.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index 3ef51d969c755130f95e64872cd425b1be1386f6..77216b695093502bdf948501b627e625f223b076 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,18 @@
+Thumbs.db
+/deploy.exclude
+/deploy.sh
+/messages.mo
+*~
+*.DS_Store
+#*
+.idea/*
+plugins.local/*
+themes.local/*
 config.php
-icons/*
+feed-icons/*
 cache/*/*
 lock/*
 tags
+cache/htmlpurifier/*/*ser
+lib/htmlpurifier/library/HTMLPurifier/DefinitionCache/Serializer/*/*ser
+web.config\r