Merge pull request #37944 from AutomaticFrenzy/patch/irv-jquery

Remove second copy of jQuery used only by IRV polls
This commit is contained in:
Jordan Brown
2018-05-21 17:33:32 -04:00
committed by letterjay
parent 6489ef5511
commit ec14a7c7ef
5 changed files with 10 additions and 10 deletions

View File

@@ -467,7 +467,12 @@ GLOBAL_LIST_EMPTY(asset_datums)
/datum/asset/simple/IRV
assets = list(
"jquery-ui.custom-core-widgit-mouse-sortable-min.js" = 'html/IRV/jquery-ui.custom-core-widgit-mouse-sortable-min.js',
"jquery-1.10.2.min.js" = 'html/IRV/jquery-1.10.2.min.js'
)
/datum/asset/group/IRV
children = list(
/datum/asset/simple/jquery,
/datum/asset/simple/IRV
)
/datum/asset/simple/changelog