Merge branch 'master' of https://gitlab.chise.org/CHISE/ids into 3type-fix
authorColtMa <mumchristmas@gmail.com>
Thu, 29 Jul 2021 08:55:40 +0000 (16:55 +0800)
committerColtMa <mumchristmas@gmail.com>
Thu, 29 Jul 2021 08:55:40 +0000 (16:55 +0800)
1  2 
IDS-UCS-Basic.txt

Simple merge