summaryrefslogtreecommitdiffstats
path: root/.gitignore
diff options
context:
space:
mode:
authorFlorian Pritz <bluewind@xinu.at>2011-08-21 17:09:54 +0200
committerFlorian Pritz <bluewind@xinu.at>2011-08-21 17:09:54 +0200
commit9f52b09abe8dd2919cf9b5d22d12abb0203eb8a8 (patch)
treefd94ba9616ccc4cfbdb3ecfddece0ce2fa1bba24 /.gitignore
parentcaec47b75d132b98a1b251448a46d3756d05c7b8 (diff)
parentc09370bebb08082ab0655a964a6e6e1331ed47fb (diff)
Merge branch 'working'
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore11
1 files changed, 11 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index 733667885..47642d17a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,14 @@ data/client/
!data/uploads/.htaccess
!.gitignore
!system/.htaccess
+!application/.htaccess
+
+.DS_Store
+
+application/cache/*
+!application/cache/index.html
+!application/cache/.htaccess
+
+application/logs/*
+!application/logs/index.html
+!application/logs/.htaccess