4 Commits

Author	SHA1	Message	Date
lain	329aa19c9f	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into alexgleason/pleroma-restrict-domain	2020-11-04 15:05:01 +01:00
Egor Kislitsyn	1a98476f48	Remove unused aliases	2020-10-30 18:42:43 +04:00
Alex Gleason	755f58168b	Merge remote-tracking branch 'upstream/develop' into restrict-domain	2020-10-13 19:26:04 -05:00
Alexander Strizhakov	7dffaef479	tests consistency	2020-10-13 16:35:09 +03:00