diff lib/redmine/activity/.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/lib/redmine/activity/.svn/entries	Thu Jul 14 10:46:20 2011 +0100
+++ b/lib/redmine/activity/.svn/entries	Thu Jul 14 10:50:53 2011 +0100
@@ -1,8 +1,8 @@
 10
 
 dir
-4411
-http://redmine.rubyforge.org/svn/trunk/lib/redmine/activity
+6270
+http://redmine.rubyforge.org/svn/branches/1.2-stable/lib/redmine/activity
 http://redmine.rubyforge.org/svn
 
 
@@ -32,7 +32,7 @@
 
 
 
-2010-09-23T14:37:45.019747Z
+2011-07-14T09:24:10.000000Z
 20597949bb74e98a3ffc97bc8a3ead7d
 2010-07-06T02:22:03.226147Z
 3829