Mercurial > hg > soundsoftware-site
diff app/views/users/.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/users/.svn/all-wcprops Thu Jan 20 09:59:02 2011 +0000 +++ b/app/views/users/.svn/all-wcprops Thu Mar 03 12:02:03 2011 +0000 @@ -1,7 +1,7 @@ K 25 svn:wc:ra_dav:version-url V 40 -/svn/!svn/ver/4729/trunk/app/views/users +/svn/!svn/ver/4900/trunk/app/views/users END _general.rhtml K 25 @@ -51,18 +51,18 @@ V 52 /svn/!svn/ver/4493/trunk/app/views/users/_form.rhtml END +_preferences.html.erb +K 25 +svn:wc:ra_dav:version-url +V 62 +/svn/!svn/ver/4900/trunk/app/views/users/_preferences.html.erb +END edit.rhtml K 25 svn:wc:ra_dav:version-url V 51 /svn/!svn/ver/4729/trunk/app/views/users/edit.rhtml END -_preferences.html.erb -K 25 -svn:wc:ra_dav:version-url -V 62 -/svn/!svn/ver/4223/trunk/app/views/users/_preferences.html.erb -END index.rhtml K 25 svn:wc:ra_dav:version-url