6 commits

Author	SHA1	Message	Date
FloatingGhost	0f6bece60d	Merge remote-tracking branch 'origin/patch/readd-mastofe' into develop	2022-01-08 21:45:12 +00:00
FloatingGhost	0d012ebea1	Revert "Merge branch 'remove/mastofe' into 'develop'" ... This reverts commit 6b3842cf50, reversing changes made to 6b1282a829.	2022-01-08 21:44:37 +00:00
sadposter	bd9c9136f9	Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop	2021-09-13 16:14:58 +01:00
Sean King	0f8da39b72	Remove priv/static/sounds folder	2021-04-16 15:56:00 -06:00
sadposter	d19b99009b	add instance resources	2019-05-30 12:11:56 +01:00
Roger Braun	d293ceb1b5	Add Mastodon frontend.	2017-11-12 14:23:05 +01:00