Merge branch 'master' into budget

2016-11-28 11:41:49 +01:00
parent 9a2d45f25d e694b9c934
commit 2a2179d0f3
219 changed files with 3311 additions and 1189 deletions
--- a/config/locales/activerecord.en.yml
+++ b/config/locales/activerecord.en.yml
@@ -66,6 +66,7 @@ en:
        username: "Username"
        password_confirmation: "Password confirmation"
        password: "Password"
+        current_password: "Current password"
        phone_number: "Phone number"
        official_position: "Official position"
        official_level: "Official level"