Merge branch 'develop' into feature/vuejs

2018-09-23 13:14:46 -07:00 · 2018-09-23 13:14:46 -07:00 · b6205463db
commit b6205463db
parent 3188782ce7 2d469cc951
33 changed files with 797 additions and 246 deletions
--- a/resources/lang/en/server.php
+++ b/resources/lang/en/server.php
@ -258,6 +258,10 @@ return [
            ],
        ],
    ],
+    'allocations' => [
+        'mass_actions' => 'Mass Actions',
+        'delete' => 'Delete Allocations',
+    ],
    'files' => [
        'exceptions' => [
            'invalid_mime' => 'This type of file cannot be edited via the Panel\'s built-in editor.',