From ae4cf699c88a2af17358f29fc85d35dfdb550de8 Mon Sep 17 00:00:00 2001
From: czaks <marcin@6irc.net>
Date: Wed, 16 Apr 2014 12:14:29 +0200
Subject: update gitignore a little bit; should work better nao, but i‘m unsure
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitignore | 27 +++++++++++++++++++++++++--
 1 file changed, 25 insertions(+), 2 deletions(-)

(limited to '.gitignore')

diff --git a/.gitignore b/.gitignore
index 73c05be2..893acfa0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,18 @@
-# static html
-*.html
+# 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
@@ -15,6 +28,16 @@
 
 # other stuff
 .DS_Store
+.htaccess
 thumbs.db
 Icon?
 Thumbs.db
+*.patch
+*.diff
+*.rej
+*.orig
+*~
+
+#vichan custom
+favicon.ico
+/static/spoiler.png
-- 
cgit v1.3


From c68865c845e7f4eb7afd3ddcb6a0bee5162b46b5 Mon Sep 17 00:00:00 2001
From: czaks <marcin@6irc.net>
Date: Fri, 18 Apr 2014 10:43:12 +0200
Subject: convert dos endlines to unix ones in .gitignore

---
 .gitignore | 86 +++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 43 insertions(+), 43 deletions(-)

(limited to '.gitignore')

diff --git a/.gitignore b/.gitignore
index 893acfa0..69317f82 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,43 +1,43 @@
-# 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
+# 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
-- 
cgit v1.3