Merge branch 'master' into openstreetbugs

This commit is contained in:
Tom Hughes 2011-06-22 22:36:43 +01:00
commit 7c98b41cc8
64 changed files with 2178 additions and 218 deletions

View file

@ -71,6 +71,8 @@ standard_settings: &standard_settings
#potlatch2_key: ""
# Whether to require users to view the CTs before continuing to edit...
require_terms_seen: false
# Whether to require users to agree to the CTs before editing
require_terms_agreed: false
development:
<<: *standard_settings