Mercurial > hg > soundsoftware-site
diff config/initializers/.svn/all-wcprops @ 246:eeebe205a056 cannam
* Merge from default branch, bringing us up to SVN trunk rev 4993
author | Chris Cannam |
---|---|
date | Thu, 03 Mar 2011 12:02:03 +0000 |
parents | cd2282d2aa55 051f544170fe |
children |
line wrap: on
line diff
--- a/config/initializers/.svn/all-wcprops Thu Jan 20 09:59:02 2011 +0000 +++ b/config/initializers/.svn/all-wcprops Thu Mar 03 12:02:03 2011 +0000 @@ -1,7 +1,7 @@ K 25 svn:wc:ra_dav:version-url V 44 -/svn/!svn/ver/4679/trunk/config/initializers +/svn/!svn/ver/4904/trunk/config/initializers END inflections.rb K 25 @@ -19,7 +19,7 @@ K 25 svn:wc:ra_dav:version-url V 58 -/svn/!svn/ver/4516/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