diff .gitignore @ 1526:404aa68d4227

Merge from live branch
author Chris Cannam
date Thu, 11 Sep 2014 12:46:20 +0100
parents 261b3d9a4903
children
line wrap: on
line diff
--- a/.gitignore	Mon Mar 17 08:57:04 2014 +0000
+++ b/.gitignore	Thu Sep 11 12:46:20 2014 +0100
@@ -1,5 +1,7 @@
 /.project
 /.loadpath
+/.powrc
+/.rvmrc
 /config/additional_environment.rb
 /config/configuration.yml
 /config/database.yml
@@ -15,8 +17,14 @@
 /lib/redmine/scm/adapters/mercurial/redminehelper.pyo
 /log/*.log*
 /log/mongrel_debug
+/plugins/*
+!/plugins/README
 /public/dispatch.*
 /public/plugin_assets
+/public/themes/*
+!/public/themes/alternate
+!/public/themes/classic
+!/public/themes/README
 /tmp/*
 /tmp/cache/*
 /tmp/pdf/*