Permalink
Browse files

Merge branch 'master' of ellislab.beanstalkapp.com:/codeigniter

  • Loading branch information...
2 parents 254217a + abccc2f commit 52ffa49ce45ce37441b735808060b138e30497ec Phil Sturgeon committed Aug 14, 2011
Showing with 9 additions and 15 deletions.
  1. +9 −0 .gitignore
  2. +0 −8 .hgflow
  3. +0 −7 .hgignore
View
@@ -0,0 +1,9 @@
+.DS_Store
+
+application/cache/*
+!application/cache/index.html
+!application/cache/.htaccess
+
+application/logs/*
+!application/logs/index.html
+!application/logs/.htaccess
View
@@ -1,8 +0,0 @@
-[Basic]
-develop = develop
-feature = feature/
-version_tag =
-publish = default
-release = release/
-hotfix = hotfix/
-
View
@@ -1,7 +0,0 @@
-syntax: glob
-
-.DS_Store
-
-syntax: regexp
-application/cache/(?!index\.html|\.htaccess)
-application/logs/(?!index\.html|\.htaccess)

0 comments on commit 52ffa49

Please sign in to comment.