3 Commits

Author	SHA1	Message	Date
Your New SJW Waifu	c4e091f969	Revert "Revert "Merge remote-tracking branch 'upstream/develop' into neckbeard"" ... This reverts commit 07e9ce3d08.	2020-05-08 20:01:59 -05:00
Your New SJW Waifu	07e9ce3d08	Revert "Merge remote-tracking branch 'upstream/develop' into neckbeard" ... This reverts commit 4250541faf	2020-05-09 00:58:11 +00:00
Shpuld Shpuldson	7a25160ddc	Separate status content from status like in direct conversations mr	2020-04-27 12:53:04 +03:00