summaryrefslogtreecommitdiff
path: root/db/constants.conf
diff options
context:
space:
mode:
authorJesusaves <cpntb1@ymail.com>2021-02-15 18:19:07 -0300
committerJesusaves <cpntb1@ymail.com>2021-02-15 18:19:07 -0300
commit434fbdc52ea0b19ce4f2739cda1cdd64b94db2fc (patch)
tree9df332394c3a3b605afd90c443c46eb1168732b0 /db/constants.conf
parent307ea235402f297a6109b637e4a068b7796224a6 (diff)
downloadserverdata-434fbdc52ea0b19ce4f2739cda1cdd64b94db2fc.tar.gz
serverdata-434fbdc52ea0b19ce4f2739cda1cdd64b94db2fc.tar.bz2
serverdata-434fbdc52ea0b19ce4f2739cda1cdd64b94db2fc.tar.xz
serverdata-434fbdc52ea0b19ce4f2739cda1cdd64b94db2fc.zip
Update to support the new changes to our server code base.
We're now Hercules v2019.10.20 with selective patches up to Hercules v2021.02.98 I've only cherry-picked what I wanted, about 40 commits, incl. features & fixes.
Diffstat (limited to 'db/constants.conf')
-rw-r--r--db/constants.conf2
1 files changed, 1 insertions, 1 deletions
diff --git a/db/constants.conf b/db/constants.conf
index c76c41092..8d1a09bd9 100644
--- a/db/constants.conf
+++ b/db/constants.conf
@@ -2372,6 +2372,6 @@ constants_db: {
ACADEMIC_SAGE: 7
ACADEMIC_GM: 8
- //@include "db/si_config.conf"
+ @include "db/si_config.conf"
@include "conf/import/constants.conf"
}