Merge branch 'develop' into feature/option-scripts

# Conflicts: # app/Http/Routes/AdminRoutes.php # app/Http/Routes/DaemonRoutes.php # app/Models/ServiceOption.php
2017-04-20 17:08:08 -04:00 · 2017-04-20 17:08:08 -04:00 · 8d24e5f168
commit 8d24e5f168
parent 03e0de28d9 d695532aa2
683 changed files with 8854 additions and 12362 deletions
--- a/app/Repositories/OptionRepository.php
+++ b/app/Repositories/OptionRepository.php
@ -73,7 +73,7 @@ class OptionRepository
    /**
     * Deletes a service option from the system.
     *
-     * @param  int    $id
+     * @param  int  $id
     * @return void
     *
     * @throws \Pterodactyl\Exceptions\DisplayException