Merge branch 'develop' into feature/vuejs

This commit is contained in:
Dane Everitt
2018-07-02 21:00:42 -07:00
52 changed files with 666 additions and 529 deletions

View File

@@ -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',