Merge branch 'features/glitch-soc-frontend' into 'develop'
authorHaelwenn <contact+git.pleroma.social@hacktivis.me>
Thu, 31 Jan 2019 10:16:11 +0000 (10:16 +0000)
committerHaelwenn <contact+git.pleroma.social@hacktivis.me>
Thu, 31 Jan 2019 10:16:11 +0000 (10:16 +0000)
commit00d43333735acbcadc1dd04ff793f4ce6e8eecb1
tree27959dec7a5ae46c194ed7b47156e4877a736a0b
parent5f40f4f74d96da7b54394e8d6fa29f00cd0c63fd
parentcda1470e02100bfcdcbd128fd08d0af64dca7271
Merge branch 'features/glitch-soc-frontend' into 'develop'

Features/glitch soc frontend

See merge request pleroma/pleroma!192
lib/pleroma/user.ex
lib/pleroma/web/mastodon_api/mastodon_api_controller.ex
lib/pleroma/web/mastodon_api/views/status_view.ex
lib/pleroma/web/router.ex
test/user_test.exs
test/web/mastodon_api/mastodon_api_controller_test.exs
test/web/mastodon_api/status_view_test.exs