diff options
| author | Stefan Wintermeyer <stefan.wintermeyer@amooma.de> | 2012-12-18 11:24:31 +0100 |
|---|---|---|
| committer | Stefan Wintermeyer <stefan.wintermeyer@amooma.de> | 2012-12-18 11:24:31 +0100 |
| commit | d25a009ebe56f669fd0b6e6e8ff579f24368abb7 (patch) | |
| tree | 4154a7976dfb7e63544285f63d014d14f9d6d73f /.gitignore | |
| parent | eaad37485fe59d0306c37cc038dda6d210052910 (diff) | |
| parent | 76a2cbbeab405f466f0fd53d7da2bf7a2f98e6a3 (diff) | |
Merge branch 'develop'
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 19 |
1 files changed, 8 insertions, 11 deletions
@@ -31,9 +31,7 @@ tmp/ nbproject Thumbs.db - # Extra -.sass-cache .livereload # Dreamweaver added files @@ -60,18 +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 # directory created by "bundle install --path ." (not needed anyway): /ruby @@ -82,7 +79,7 @@ tmp/cache /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 |