Mercurial > hg > soundsoftware-site
diff config/initializers/.svn/all-wcprops @ 523:0b6c82dead28 luisf
Merge from branch "cannam"
author | luisf <luis.figueira@eecs.qmul.ac.uk> |
---|---|
date | Mon, 25 Jul 2011 14:23:37 +0100 |
parents | eeebe205a056 |
children |
line wrap: on
line diff
--- a/config/initializers/.svn/all-wcprops Mon Mar 28 18:17:06 2011 +0100 +++ b/config/initializers/.svn/all-wcprops Mon Jul 25 14:23:37 2011 +0100 @@ -1,7 +1,7 @@ K 25 svn:wc:ra_dav:version-url V 44 -/svn/!svn/ver/4389/trunk/config/initializers +/svn/!svn/ver/4904/trunk/config/initializers END inflections.rb K 25 @@ -13,13 +13,13 @@ K 25 svn:wc:ra_dav:version-url V 58 -/svn/!svn/ver/2493/trunk/config/initializers/30-redmine.rb +/svn/!svn/ver/4679/trunk/config/initializers/30-redmine.rb END 10-patches.rb K 25 svn:wc:ra_dav:version-url V 58 -/svn/!svn/ver/4389/trunk/config/initializers/10-patches.rb +/svn/!svn/ver/4904/trunk/config/initializers/10-patches.rb END backtrace_silencers.rb K 25 @@ -27,12 +27,6 @@ V 67 /svn/!svn/ver/2895/trunk/config/initializers/backtrace_silencers.rb END -40-email.rb -K 25 -svn:wc:ra_dav:version-url -V 56 -/svn/!svn/ver/1625/trunk/config/initializers/40-email.rb -END 20-mime_types.rb K 25 svn:wc:ra_dav:version-url