mirror of
https://github.com/snipe/snipe-it.git
synced 2026-03-02 14:29:30 +00:00
# Conflicts: # public/css/dist/bootstrap-table.css # public/js/dist/bootstrap-table.js # resources/views/blade/table/index.blade.php # resources/views/models/custom_fields_form.blade.php