diff options
| author | Peter Kozak <spag@golwen.net> | 2012-12-20 10:03:24 +0100 |
|---|---|---|
| committer | Peter Kozak <spag@golwen.net> | 2012-12-20 10:03:24 +0100 |
| commit | e405bce6ab07f385e32c0d885b1d51ca96bf1ff5 (patch) | |
| tree | 510ced8b7d925f46292ee872d04aaa25a9d0a17f /.gitignore | |
| parent | 6bf23a88899522a52740113a3cfdccc7ae533fca (diff) | |
| parent | 5c270c981a21d9aafaecb3b59b98dfa6a3d9d97f (diff) | |
Merge branch 'develop' of github.com:amooma/GS5 into develop
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 19 |
1 files changed, 7 insertions, 12 deletions
@@ -31,9 +31,7 @@ tmp/ nbproject Thumbs.db - # Extra -.sass-cache .livereload # Dreamweaver added files @@ -60,20 +58,17 @@ tmp/**/* # Ignore fixtures. We use factory_girl. /test/fixtures/*.yml -ERD.pdf -ERD.png - /vendor/cache /vendor/bundle .settings/* /.idea # ignore Sass cache: -/.sass-cache -tmp/sass-cache -tmp/cache +.sass-cache +/tmp/sass-cache +/tmp/cache -public/assets +/public/assets # directory created by "bundle install --path ." (not needed anyway): /ruby @@ -84,7 +79,7 @@ public/assets /tmp # Images -public/uploads +/public/uploads # Freeswitch -misc/freeswitch/conf/freeswitch.serial -misc/freeswitch/scripts/ini/gateway_gateway1.ini +/misc/freeswitch/conf/freeswitch.serial +/misc/freeswitch/scripts/ini/gateway_gateway1.ini |