Alex S bdfa3a6fa8 Merging with develop ...

Conflicts:
lib/pleroma/web/activity_pub/transmogrifier.ex
lib/pleroma/user.ex

2019-05-01 12:29:33 +07:00

..

views

Fix bookmarks depending on embeded object and move checking if the

2019-04-27 23:06:46 +03:00

mastodon_api_controller.ex

Merging with develop

2019-05-01 12:29:33 +07:00

mastodon_api.ex

Handle reblogs on the first follow request in MastoAPI

2019-04-20 04:39:49 +03:00

subscription_controller.ex

[#647] tests for web push

2019-03-06 13:20:12 +00:00

websocket_handler.ex

Use User.get_cached* everywhere

2019-04-22 07:20:43 +00:00