merges master and fixes conflicts

2015-08-18 09:35:13 +02:00
parent cf4495e17c 1f5f6d2589
commit b28f63b016
80 changed files with 18565 additions and 128 deletions
--- a/config/locales/activerecord.es.yml
+++ b/config/locales/activerecord.es.yml
@@ -23,5 +23,7 @@ es:
        nickname: Pseudónimo
        password: Contraseña
        phone_number: Teléfono
+        official_position: Cargo público
+        official_level: Nivel del cargo
      organization:
        name: Nombre de organización