Merge branch 'release/v0.7.14' into feature/react

2019-06-22 12:28:44 -07:00 · 2019-06-22 12:28:44 -07:00 · 56640253b9
commit 56640253b9
parent 2a626a3e1f c38f78df84
16 changed files with 178 additions and 59 deletions
--- a/config/app.php
+++ b/config/app.php
@ -9,7 +9,7 @@ return [
    | change this value if you are not maintaining your own internal versions.
    */

-    'version' => 'canary',
+    'version' => '0.7.14',

    /*
    |--------------------------------------------------------------------------
--- a/config/pterodactyl.php
+++ b/config/pterodactyl.php
@ -1,6 +1,5 @@
 <?php

-
 return [
    /*
    |--------------------------------------------------------------------------