Alex Gleason dae909ad34 Revert "Merge branch 'from/upstream-develop/tusooa/sync-settings' into 'develop'" ... This reverts commit 93f12c0d0d, reversing changes made to 6ce3f76b5d.		2022-08-13 14:06:21 -05:00
..
mix	Merge remote-tracking branch 'pleroma/develop' into merge-pleroma	2022-08-13 13:42:11 -05:00
phoenix/transports/web_socket	Copyright bump for 2022	2022-02-25 23:11:42 -07:00
pleroma	Revert "Merge branch 'from/upstream-develop/tusooa/sync-settings' into 'develop'"	2022-08-13 14:06:21 -05:00
soapbox.ex	Bump version 1.1.1, update changelog	2021-05-21 13:30:36 -05:00