Merge branch 'features/mastoapi-multi-hashtag' into 'develop'
authorkaniini <nenolod@gmail.com>
Sun, 27 Jan 2019 12:45:50 +0000 (12:45 +0000)
committerkaniini <nenolod@gmail.com>
Sun, 27 Jan 2019 12:45:50 +0000 (12:45 +0000)
commit5eb81d2c72c593d5b7dfb893827c0685467c21ca
tree46fd8c65465726ee497e2276db91c47d1e8fd22c
parentb58e4ddb10a1144a0afbac259cbe8bfcfd363ba6
parentde956b9e04f9c3706d50522bf19a0fb6477feecc
Merge branch 'features/mastoapi-multi-hashtag' into 'develop'

MastodonAPI multi-hashtag

See merge request pleroma/pleroma!652
lib/pleroma/web/activity_pub/activity_pub.ex
lib/pleroma/web/mastodon_api/mastodon_api_controller.ex
test/web/activity_pub/activity_pub_test.exs
test/web/mastodon_api/mastodon_api_controller_test.exs