Merge branch 'master' into master

This commit is contained in:
Thalpy
2019-07-15 21:23:04 +01:00
committed by GitHub
130 changed files with 707 additions and 291 deletions
-1
View File
@@ -47,7 +47,6 @@ GLOBAL_LIST_INIT(bitfields, list(
"NO_MAT_REDEMPTION" = NO_MAT_REDEMPTION,
"DROPDEL" = DROPDEL,
"NOBLUDGEON" = NOBLUDGEON,
"NODROP" = NODROP,
"ABSTRACT" = ABSTRACT,
),
"admin_flags" = list(