Dane Everitt 8d24e5f168 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
..
databases	move databases and locations create button in the top right corner to match other lists	2017-03-18 21:25:36 +01:00
locations	move databases and locations create button in the top right corner to match other lists	2017-03-18 21:25:36 +01:00
nodes	Various thematic updates to improve responsive views	2017-04-14 01:44:06 -04:00
packs	Various thematic updates to improve responsive views	2017-04-14 01:44:06 -04:00
servers	Allow deleting default allocation and setting new default at the same time.	2017-04-17 21:07:37 -04:00
services	Merge branch 'develop' into feature/option-scripts	2017-04-20 17:08:08 -04:00
users	Assorted fixes	2017-04-14 20:10:09 -04:00
index.blade.php	Various thematic updates to improve responsive views	2017-04-14 01:44:06 -04:00
settings.blade.php	Use env() properly throughout panel to avoid cache issues.	2017-03-18 15:56:19 -04:00