From: ColtMa <mumchristmas@gmail.com>
Date: Tue, 8 Jun 2021 02:44:54 +0000 (+0800)
Subject: Merge commit 'd31593a153479c360647833e5169bafb66c19d60' into 3type-fix
X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d9b8d9c0176e12bbf33dde687855b7eea0c89ed7;p=chise%2Fids.git

Merge commit 'd31593a153479c360647833e5169bafb66c19d60' into 3type-fix

# Conflicts:
#	IDS-UCS-Basic.txt
---

d9b8d9c0176e12bbf33dde687855b7eea0c89ed7