Alex Gleason e8928e2295 Merge branch 'merge-pleroma' into 'develop' ... Merge Pleroma See merge request soapbox-pub/rebased!247		2023-06-07 21:50:27 +00:00
..
mix	Merge remote-tracking branch 'pleroma/develop' into merge-pleroma	2023-03-15 19:39:24 +01:00
phoenix/transports/web_socket	Revert "Merge branch 'copyright-bump' into 'develop'"	2023-01-02 20:38:50 +00:00
pleroma	Merge branch 'merge-pleroma' into 'develop'	2023-06-07 21:50:27 +00:00
soapbox.ex	Bump version to v3.0	2022-12-24 16:59:22 -06:00