fixes conflicts with master

2017-01-05 01:56:35 +01:00
parent 517483f244 6e5492de22
commit dde1d34172
13 changed files with 13 additions and 16 deletions
--- a/db/seeds.rb
+++ b/db/seeds.rb
@@ -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/'