Merge branch 'user_management' into dev

2016-01-29 00:40:32 +01:00
parent 3902a75b2c 527b482ab8
commit 593506c646
4 changed files with 40 additions and 23 deletions
@@ -13,6 +13,7 @@ return [
    'status_deleted'          => 'Deleted',
    'status_blocked'          => 'Blocked',
    'status_active'           => 'Active',
+    'allStatuses'            => 'All',
    'register'                => 'Create user',
    'registrationSuccessfull' => 'New user successfully added.',
    'profile'                 => 'Your profile',