Merge branch 'develop' into feature/polls-2-electric-boogalo
authorrinpatch <rinpatch@sdf.org>
Mon, 3 Jun 2019 08:14:52 +0000 (11:14 +0300)
committerrinpatch <rinpatch@sdf.org>
Mon, 3 Jun 2019 08:14:52 +0000 (11:14 +0300)
commit026b245dbc2900d90a737f024b87453bf552b62b
tree8bab0696129f9ba0154879f831cb7543b508a9f2
parent5bd41fef8b5aeff53ed6b096e04507d51c93a83a
parent1236c5dbf55d631b10ad0e73836a2a9cd43ddaa8
Merge branch 'develop' into feature/polls-2-electric-boogalo
lib/pleroma/notification.ex
lib/pleroma/web/activity_pub/transmogrifier.ex
lib/pleroma/web/mastodon_api/mastodon_api_controller.ex
lib/pleroma/web/router.ex
test/web/activity_pub/transmogrifier_test.exs
test/web/mastodon_api/mastodon_api_controller_test.exs