Merge remote-tracking branch 'origin/develop'

This commit is contained in:
snipe 2023-10-26 13:09:38 +01:00
commit d40a03b4c5

View file

@ -1089,6 +1089,7 @@ class AssetsController extends Controller
break;
case 'location':
$assets->OrderLocation($order);
break;
default:
$assets->orderBy($column_sort, $order);
break;