Merge branch 'develop' into feature/vuejs

2018-07-02 21:00:42 -07:00 · 2018-07-02 21:00:42 -07:00 · 48cb01f438
commit 48cb01f438
parent e5e66fdb58 422e5dd99f
52 changed files with 666 additions and 529 deletions
--- a/resources/lang/de/strings.php
+++ b/resources/lang/de/strings.php
@ -48,7 +48,7 @@ return [
    'select_none' => 'Alles abwählen',
    'alias' => 'Alias',
    'primary' => 'Primär',
-    'make_primary' => 'Primät machen',
+    'make_primary' => 'Primär machen',
    'none' => 'Nichts',
    'cancel' => 'Abbrechen',
    'created_at' => 'Erstellt am',