diff options
| author | Phil Sturgeon <email@philsturgeon.co.uk> | 2011-08-14 20:12:31 +0200 |
|---|---|---|
| committer | Phil Sturgeon <email@philsturgeon.co.uk> | 2011-08-14 20:12:31 +0200 |
| commit | 52ffa49ce45ce37441b735808060b138e30497ec (patch) | |
| tree | f998a15945bbb8e6e80e61dcf8eeff94da924c2f | |
| parent | 254217a8655a14716bb673a0abde81c0b80ccd90 (diff) | |
| parent | abccc2fa65eea5f64773952661a8ba79e559333b (diff) | |
Merge branch 'master' of ellislab.beanstalkapp.com:/codeigniter
| -rw-r--r-- | .gitignore | 9 | ||||
| -rw-r--r-- | .hgflow | 8 | ||||
| -rw-r--r-- | .hgignore | 7 |
3 files changed, 9 insertions, 15 deletions
diff --git a/.gitignore b/.gitignore new file mode 100644 index 000000000..d740c498f --- /dev/null +++ b/.gitignore @@ -0,0 +1,9 @@ +.DS_Store + +application/cache/* +!application/cache/index.html +!application/cache/.htaccess + +application/logs/* +!application/logs/index.html +!application/logs/.htaccess
\ No newline at end of file diff --git a/.hgflow b/.hgflow deleted file mode 100644 index ad6e56e0f..000000000 --- a/.hgflow +++ /dev/null @@ -1,8 +0,0 @@ -[Basic] -develop = develop -feature = feature/ -version_tag = -publish = default -release = release/ -hotfix = hotfix/ - diff --git a/.hgignore b/.hgignore deleted file mode 100644 index 5ee4d823e..000000000 --- a/.hgignore +++ /dev/null @@ -1,7 +0,0 @@ -syntax: glob - -.DS_Store - -syntax: regexp -application/cache/(?!index\.html|\.htaccess) -application/logs/(?!index\.html|\.htaccess) |