diff config/.svn/dir-prop-base @ 514:7eba09d624db live

Merge
author Chris Cannam
date Thu, 14 Jul 2011 10:50:53 +0100
parents 0579821a129a
children
line wrap: on
line diff
--- a/config/.svn/dir-prop-base	Thu Jul 14 10:46:20 2011 +0100
+++ b/config/.svn/dir-prop-base	Thu Jul 14 10:50:53 2011 +0100
@@ -1,7 +1,8 @@
 K 10
 svn:ignore
-V 23
+V 41
 database.yml
 email.yml
+configuration.yml
 
 END