Merge branch 'master' into polls

This commit is contained in:
Juanjo Bazán
2017-01-03 23:04:21 +01:00
12 changed files with 12 additions and 15 deletions

View File

@@ -91,3 +91,6 @@ Setting['direct_message_max_per_day'] = 3
# Email settings
Setting['mailer_from_name'] = 'Consul'
Setting['mailer_from_address'] = 'noreply@consul.dev'
# Verification settings
Setting['verification_offices_url'] = 'http://oficinas-atencion-ciudadano.url/'