diff app/views/users/.svn/all-wcprops @ 442:753f1380d6bc cannam

Merge from branch "redmine-1.2"

--- a/app/views/users/.svn/all-wcprops	Thu Mar 03 15:08:45 2011 +0000
+++ b/app/views/users/.svn/all-wcprops	Mon Jun 06 14:41:04 2011 +0100
@@ -1,77 +1,5 @@
-K 25
-svn:wc:ra_dav:version-url
-V 40
-/svn/!svn/ver/4900/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 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
+/svn/!svn/ver/5878/branches/1.2-stable/app/views/users
 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 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 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 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
-index.rhtml
-K 25
-svn:wc:ra_dav:version-url
-V 52
-/svn/!svn/ver/4729/trunk/app/views/users/index.rhtml
-END
-show.api.rsb
-K 25
-svn:wc:ra_dav:version-url
-V 53
-/svn/!svn/ver/4486/trunk/app/views/users/show.api.rsb
-END