Mercurial > hg > soundsoftware-site
diff app/views/users/.svn/all-wcprops @ 120:cd2282d2aa55 cannam
Merge from the default branch. Note that this is not a valid SVN repository any more (use default, redmine-1.1 etc for SVN updates).
author | Chris Cannam |
---|---|
date | Thu, 13 Jan 2011 14:33:08 +0000 |
parents | af80e5618e9b 8661b858af72 |
children | 5e974759e8b2 |
line wrap: on
line diff
--- a/app/views/users/.svn/all-wcprops Thu Jan 13 13:21:03 2011 +0000 +++ b/app/views/users/.svn/all-wcprops Thu Jan 13 14:33:08 2011 +0000 @@ -1,35 +1,77 @@ K 25 svn:wc:ra_dav:version-url -V 54 -/svn/!svn/ver/4585/branches/1.1-stable/app/views/users +V 40 +/svn/!svn/ver/4508/trunk/app/views/users +END +_general.rhtml +K 25 +svn:wc:ra_dav:version-url +V 55 +/svn/!svn/ver/4249/trunk/app/views/users/_general.rhtml END _memberships.rhtml K 25 svn:wc:ra_dav:version-url -V 73 -/svn/!svn/ver/4585/branches/1.1-stable/app/views/users/_memberships.rhtml +V 59 +/svn/!svn/ver/4508/trunk/app/views/users/_memberships.rhtml +END +_groups.rhtml +K 25 +svn:wc:ra_dav:version-url +V 54 +/svn/!svn/ver/4230/trunk/app/views/users/_groups.rhtml +END +new.html.erb +K 25 +svn:wc:ra_dav:version-url +V 53 +/svn/!svn/ver/4229/trunk/app/views/users/new.html.erb END _mail_notifications.html.erb K 25 svn:wc:ra_dav:version-url -V 83 -/svn/!svn/ver/4585/branches/1.1-stable/app/views/users/_mail_notifications.html.erb +V 69 +/svn/!svn/ver/4497/trunk/app/views/users/_mail_notifications.html.erb END index.api.rsb K 25 svn:wc:ra_dav:version-url -V 68 -/svn/!svn/ver/4585/branches/1.1-stable/app/views/users/index.api.rsb +V 54 +/svn/!svn/ver/4489/trunk/app/views/users/index.api.rsb +END +show.rhtml +K 25 +svn:wc:ra_dav:version-url +V 51 +/svn/!svn/ver/4382/trunk/app/views/users/show.rhtml END _form.rhtml K 25 svn:wc:ra_dav:version-url -V 66 -/svn/!svn/ver/4585/branches/1.1-stable/app/views/users/_form.rhtml +V 52 +/svn/!svn/ver/4493/trunk/app/views/users/_form.rhtml +END +edit.rhtml +K 25 +svn:wc:ra_dav:version-url +V 51 +/svn/!svn/ver/4231/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 +V 52 +/svn/!svn/ver/4231/trunk/app/views/users/index.rhtml END show.api.rsb K 25 svn:wc:ra_dav:version-url -V 67 -/svn/!svn/ver/4585/branches/1.1-stable/app/views/users/show.api.rsb +V 53 +/svn/!svn/ver/4486/trunk/app/views/users/show.api.rsb END