diff .hgignore @ 1484:51364c0cd58f redmine-2.4-integration

Merge from live branch. Still need to merge manually in files overridden by plugins.
author Chris Cannam
date Wed, 15 Jan 2014 09:59:14 +0000
parents 261b3d9a4903 0a574315af3e
children 7b23adecd963
line wrap: on
line diff
--- a/.hgignore	Tue Jan 14 14:37:42 2014 +0000
+++ b/.hgignore	Wed Jan 15 09:59:14 2014 +0000
@@ -32,7 +32,10 @@
 vendor/rails
 *.rbc
 .git/
+*~
+public/themes/soundsoftware/stylesheets/fonts/*
 .bundle
 Gemfile.lock
 Gemfile.local
 
+re:^config\.ru$