merges master and fix conflicts

2015-09-12 19:54:15 +02:00
parent 07b99fcf19 f97fc56bb7
commit 5903ebe857
41 changed files with 279 additions and 135 deletions
--- a/config/locales/activerecord.en.yml
+++ b/config/locales/activerecord.en.yml
@@ -31,3 +31,4 @@ en:
        official_level: Official level
      organization:
        name: Organization name
+        responsible_name: Person in charge