Mercurial > hg > soundsoftware-site
diff app/views/.svn/entries @ 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/.svn/entries Thu Jan 13 13:21:03 2011 +0000 +++ b/app/views/.svn/entries Thu Jan 13 14:33:08 2011 +0000 @@ -2,14 +2,14 @@ dir 4707 -http://redmine.rubyforge.org/svn/branches/1.1-stable/app/views +http://redmine.rubyforge.org/svn/trunk/app/views http://redmine.rubyforge.org/svn -2011-01-08T10:14:00.269730Z -4660 -jplang +2011-01-11T16:04:07.541291Z +4698 +tmaruyama @@ -68,22 +68,22 @@ custom_fields dir -issue_moves +users dir -users +issue_moves dir files dir -previews +ldap_auth_sources dir auth_sources dir -ldap_auth_sources +previews dir search @@ -92,10 +92,10 @@ messages dir -versions +issue_relations dir -issue_relations +versions dir mailer