Alex Gleason 8833ea7a1b Merge branch 'rebased-fixes' into 'develop' ... Fix Rebased --> Pleroma instance version See merge request soapbox-pub/rebased!167		2022-08-25 19:28:51 +00: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	Merge branch 'rebased-fixes' into 'develop'	2022-08-25 19:28:51 +00:00
soapbox.ex	Bump version 1.1.1, update changelog	2021-05-21 13:30:36 -05:00