Merge branch 'master' of github.com:vichan-devel/Tinyboard into br-integration

1 files changed, 43 insertions, 20 deletions

diff --git a/.gitignore b/.gitignore
index 73c05be2..69317f82 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,20 +1,43 @@
-# static html

-*.html

-

-# instance-config

-/inc/instance-config.php

-

-# .installed

-/.installed

-

-# script file

-/main.js

-

-# templates cache

-/templates/cache

-

-# other stuff

-.DS_Store

-thumbs.db

-Icon?

-Thumbs.db

+# static html and json
+/*/*.html
+/*/*.json
+/*/res
+/*/src
+/*/thumb
+/*/config.php
+/*.html
+
+# include some files though
+!/templates/*.html
+!/inc/config.php
+
+# minify
+/inc/lib/minify
+
+# instance-config
+/inc/instance-config.php
+
+# .installed
+/.installed
+
+# script file
+/main.js
+
+# templates cache
+/templates/cache
+
+# other stuff
+.DS_Store
+.htaccess
+thumbs.db
+Icon?
+Thumbs.db
+*.patch
+*.diff
+*.rej
+*.orig
+*~
+
+#vichan custom
+favicon.ico
+/static/spoiler.png