Merge branch 'develop'

This commit is contained in:
snipe 2017-11-16 13:49:05 -08:00
commit 59b18a6ada

View file

@ -141,7 +141,6 @@ class CategoriesController extends Controller
*/
public function selectlist(Request $request, $category_type = 'asset')
{
$this->authorize('view', Categories::class);
$categories = Category::select([
'id',