mirror of
https://github.com/snipe/snipe-it.git
synced 2024-09-20 15:57:41 -07:00
Merge branch 'develop' of github.com:snipe/snipe-it into develop
This commit is contained in:
commit
dd6a477355
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
|
@ -1,4 +1,4 @@
|
|||
{
|
||||
"assets/css/app.css": "assets/css/app-d98e951062.css",
|
||||
"assets/js/all.js": "assets/js/all-0c172586e9.js"
|
||||
"assets/js/all.js": "assets/js/all-af13f4d46c.js"
|
||||
}
|
|
@ -140,7 +140,7 @@ $(document).ready(function () {
|
|||
{
|
||||
// Vue collision: Avoid overriding a vue select2 instance
|
||||
// by checking to see if the item has already been select2'd.
|
||||
$('.select2:not([class^="select2-container"])').each((i,obj) => {
|
||||
$('select.select2:not(".select2-hidden-accessible")').each((i,obj) => {
|
||||
{
|
||||
$(obj).select2();
|
||||
}
|
||||
|
|
File diff suppressed because one or more lines are too long
Loading…
Reference in a new issue