diff app/views/.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/.svn/entries	Thu Jul 14 10:46:20 2011 +0100
+++ b/app/views/.svn/entries	Thu Jul 14 10:50:53 2011 +0100
@@ -1,14 +1,14 @@
 10
 
 dir
-4411
-http://redmine.rubyforge.org/svn/trunk/app/views
+6270
+http://redmine.rubyforge.org/svn/branches/1.2-stable/app/views
 http://redmine.rubyforge.org/svn
 
 
 
-2010-11-16T19:49:08.085592Z
-4409
+2011-07-09T11:42:12.586037Z
+6205
 jplang
 
 
@@ -38,49 +38,49 @@
 members
 dir
 
-welcome
+context_menus
 dir
 
-context_menus
+welcome
 dir
 
 journals
 dir
 
+time_entry_reports
+dir
+
 workflows
 dir
 
-time_entry_reports
-dir
-
 reports
 dir
 
-timelog
-dir
-
-settings
-dir
-
 layouts
 dir
 
 custom_fields
 dir
 
-users
+settings
+dir
+
+timelog
 dir
 
 issue_moves
 dir
 
+users
+dir
+
 files
 dir
 
-ldap_auth_sources
+auth_sources
 dir
 
-auth_sources
+ldap_auth_sources
 dir
 
 previews
@@ -92,10 +92,10 @@
 messages
 dir
 
-issue_relations
+versions
 dir
 
-versions
+issue_relations
 dir
 
 mailer