Merge branch 'master' of github.com:mikedfunk/Base-CodeIgniter-App

mikedfunk · Feb 29, 2012 · 0f3139b · 0f3139b
2 parents 4781989 + 0d9e69e
commit 0f3139b
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/.gitignore b/.gitignore
@@ -6,10 +6,10 @@
 # *assets/cache/*.css
 # ----------- 
 
-application/cache/*
+*application/cache/*
 !.gitignore
 
-assets/cache/*
+*assets/cache/*
 !.gitignore
 
 *assets/scripts/tiny_mce/*.gz

diff --git a/application/third_party/carabiner b/application/third_party/carabiner
diff --git a/assets/cache/.gitignore b/assets/cache/.gitignore