Alex Gleason 854b6ce816 Merge remote-tracking branch 'origin/develop' into cycles-phase-2		2021-06-02 16:12:45 -05:00
..
mix	Simplify mix pleroma.instance gen task	2021-05-16 16:46:21 -05:00
phoenix/transports/web_socket	Bump Copyright to 2021	2021-01-13 07:49:50 +01:00
pleroma	Merge remote-tracking branch 'origin/develop' into cycles-phase-2	2021-06-02 16:12:45 -05:00
soapbox.ex	Bump version 1.1.1, update changelog	2021-05-21 13:30:36 -05:00