Mercurial > hg > soundsoftware-site
diff app/views/activities/.svn/entries @ 514:7eba09d624db live
Merge
author | Chris Cannam |
---|---|
date | Thu, 14 Jul 2011 10:50:53 +0100 |
parents | 851510f1b535 |
children |
line wrap: on
line diff
--- a/app/views/activities/.svn/entries Thu Jul 14 10:46:20 2011 +0100 +++ b/app/views/activities/.svn/entries Thu Jul 14 10:50:53 2011 +0100 @@ -1,15 +1,15 @@ 10 dir -4411 -http://redmine.rubyforge.org/svn/trunk/app/views/activities +6270 +http://redmine.rubyforge.org/svn/branches/1.2-stable/app/views/activities http://redmine.rubyforge.org/svn -2010-08-27T14:05:54.014502Z -4047 -edavis10 +2011-04-03T14:01:32.419875Z +5301 +jplang @@ -32,11 +32,11 @@ -2010-09-24T12:48:29.578245Z -9e6d9091be2c8769f8e262500d974f84 -2010-08-27T14:05:54.014502Z -4047 -edavis10 +2011-07-14T09:24:21.000000Z +842302ab754ce754f88204a7074c4b9d +2011-04-03T14:01:32.419875Z +5301 +jplang has-props @@ -58,5 +58,5 @@ -3266 +2936