Mercurial > hg > soundsoftware-site
diff app/views/layouts/.svn/all-wcprops @ 442:753f1380d6bc cannam
Merge from branch "redmine-1.2"
author | Chris Cannam |
---|---|
date | Mon, 06 Jun 2011 14:41:04 +0100 |
parents | eeebe205a056 cbce1fd3b1b7 |
children |
line wrap: on
line diff
--- a/app/views/layouts/.svn/all-wcprops Thu Mar 03 15:08:45 2011 +0000 +++ b/app/views/layouts/.svn/all-wcprops Mon Jun 06 14:41:04 2011 +0100 @@ -1,29 +1,5 @@ K 25 svn:wc:ra_dav:version-url -V 42 -/svn/!svn/ver/4965/trunk/app/views/layouts +V 56 +/svn/!svn/ver/5878/branches/1.2-stable/app/views/layouts END -base.rhtml -K 25 -svn:wc:ra_dav:version-url -V 53 -/svn/!svn/ver/4965/trunk/app/views/layouts/base.rhtml -END -mailer.text.plain.erb -K 25 -svn:wc:ra_dav:version-url -V 64 -/svn/!svn/ver/4362/trunk/app/views/layouts/mailer.text.plain.erb -END -mailer.text.html.erb -K 25 -svn:wc:ra_dav:version-url -V 63 -/svn/!svn/ver/4362/trunk/app/views/layouts/mailer.text.html.erb -END -admin.rhtml -K 25 -svn:wc:ra_dav:version-url -V 54 -/svn/!svn/ver/3176/trunk/app/views/layouts/admin.rhtml -END