Merge pull request #6832 from Citadel-Station-13/upstream-merge-37944

[MIRROR] Remove second copy of jQuery used only by IRV polls
This commit is contained in:
deathride58
2018-05-22 02:27:21 +00:00
committed by GitHub
5 changed files with 10 additions and 10 deletions
+6 -1
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