Mercurial > hg > soundsoftware-site
diff config/.svn/text-base/settings.yml.svn-base @ 51:371eac10df0b live
* Merge from "cannam" branch. This includes update to Redmine trunk, plus welcome/tip-of-the-day from luisf branch.
author | Chris Cannam |
---|---|
date | Wed, 24 Nov 2010 12:20:08 +0000 |
parents | 94944d00e43c |
children | af80e5618e9b |
line wrap: on
line diff
--- a/config/.svn/text-base/settings.yml.svn-base Thu Oct 21 11:19:14 2010 +0100 +++ b/config/.svn/text-base/settings.yml.svn-base Wed Nov 24 12:20:08 2010 +0000 @@ -184,3 +184,7 @@ default: '' rest_api_enabled: default: 0 +default_notification_option: + default: 'only_my_events' +emails_header: + default: ''