From 76a2cbbeab405f466f0fd53d7da2bf7a2f98e6a3 Mon Sep 17 00:00:00 2001 From: Stefan Wintermeyer Date: Tue, 18 Dec 2012 11:18:00 +0100 Subject: Updated .gitignore --- .gitignore | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) (limited to '.gitignore') diff --git a/.gitignore b/.gitignore index 873c732..65a18ad 100644 --- a/.gitignore +++ b/.gitignore @@ -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 -- cgit v1.2.3