Merge branch 'develop' into feature/vuejs

This commit is contained in:
Dane Everitt 2018-09-23 13:14:46 -07:00
commit b6205463db
No known key found for this signature in database
GPG key ID: EEA66103B3D71F53
33 changed files with 797 additions and 246 deletions

View file

@ -153,6 +153,7 @@ Route::group(['prefix' => 'nodes'], function () {
Route::delete('/view/{node}/delete', 'NodesController@delete')->name('admin.nodes.view.delete');
Route::delete('/view/{node}/allocation/remove/{allocation}', 'NodesController@allocationRemoveSingle')->name('admin.nodes.view.allocation.removeSingle');
Route::delete('/view/{node}/allocations', 'NodesController@allocationRemoveMultiple')->name('admin.nodes.view.allocation.removeMultiple');
});
/*