kaniini 76c67a41c1 Merge branch 'develop' into 'feature/staff-discovery-api' ... # Conflicts: # lib/pleroma/web/nodeinfo/nodeinfo_controller.ex		2018-09-03 14:55:42 +00:00
..
activity_pub	tests: add regression tests	2018-09-01 23:33:10 +00:00
common_api	Revert "Merge branch 'feature/rich-text' into 'develop'"	2018-08-31 09:51:20 +00:00
http_sigs
mastodon_api	Merge branch 'feature/mastodon_api_2.4.x' into 'develop'	2018-09-03 12:33:36 +00:00
oauth
ostatus
salmon
twitter_api	Merge branch 'hotfix_broken_likes' into 'develop'	2018-09-02 12:37:00 +00:00
views
web_finger
websub
federator_test.exs
node_info_test.exs	tests: add test for staffAccounts presence in nodeinfo	2018-09-03 14:48:36 +00:00
streamer_test.exs