2 commits

Author	SHA1	Message	Date
muppeth	b99bc4d8ef	merged upstream; fixed margin in msg text;	2021-07-12 01:31:00 +02:00
muppeth	44e5df4227	small fixes and merge with conversejs upstream master branch	2021-05-21 12:34:27 +02:00