feld 008499f65a Merge branch 'develop' into 'fix/2412-filters' ... # Conflicts: # CHANGELOG.md		2021-02-03 14:23:23 +00:00
..
activity_pub	Switch to a build of Majic that does not try to fix extensions by default	2021-01-28 14:03:29 -06:00
admin_api	Merge branch 'feature/2438-users-posts-total-count' into 'develop'	2021-02-03 14:21:57 +00:00
api_spec	…
auth	…
common_api	…
endpoint	…
feed	…
mastodon_api	Merge branch 'develop' into 'fix/2412-filters'	2021-02-03 14:23:23 +00:00
media_proxy	…
metadata	…
o_auth	…
o_status	…
pleroma_api	Add active user count	2021-01-27 18:20:06 +04:00
plugs	Add tests	2021-01-27 18:20:07 +04:00
preload/providers	…
push	…
rich_media	…
static_fe	…
twitter_api	…
views	…
web_finger	…
chat_channel_test.exs	…
common_api_test.exs	…
fallback_test.exs	…
federator_test.exs	…
media_proxy_test.exs	…
mongoose_im_controller_test.exs	…
node_info_test.exs	…
rel_me_test.exs	…
streamer_test.exs	…
uploader_controller_test.exs	…
web_finger_test.exs	…