Mercurial > hg > soundsoftware-site
diff app/views/settings/.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 | 5e974759e8b2 051f544170fe |
children | 753f1380d6bc |
line wrap: on
line diff
--- a/app/views/settings/.svn/all-wcprops Thu Jan 20 09:59:02 2011 +0000 +++ b/app/views/settings/.svn/all-wcprops Thu Mar 03 12:02:03 2011 +0000 @@ -1,7 +1,7 @@ K 25 svn:wc:ra_dav:version-url V 43 -/svn/!svn/ver/4730/trunk/app/views/settings +/svn/!svn/ver/4983/trunk/app/views/settings END _issues.rhtml K 25 @@ -37,7 +37,7 @@ K 25 svn:wc:ra_dav:version-url V 58 -/svn/!svn/ver/3198/trunk/app/views/settings/_display.rhtml +/svn/!svn/ver/4811/trunk/app/views/settings/_display.rhtml END edit.rhtml K 25 @@ -49,7 +49,7 @@ K 25 svn:wc:ra_dav:version-url V 63 -/svn/!svn/ver/4470/trunk/app/views/settings/_repositories.rhtml +/svn/!svn/ver/4983/trunk/app/views/settings/_repositories.rhtml END _notifications.rhtml K 25