Merge branch 'features/flavour-switching' into 'develop'
authorkaniini <nenolod@gmail.com>
Mon, 18 Feb 2019 04:01:51 +0000 (04:01 +0000)
committerkaniini <nenolod@gmail.com>
Mon, 18 Feb 2019 04:01:51 +0000 (04:01 +0000)
commitc23bd05737c38c407f998d3aa48c5c3d191f0c56
tree0f6a25c242237081c6e7bbb49b01e0c082c2ae3e
parentcd019a5927059bb52447add43a9b29893928c416
parent72a4272d84a68ceb4d9a39ddaa4d3f45779bfebf
Merge branch 'features/flavour-switching' into 'develop'

[MastoAPI] Add switching of frontend flavours

See merge request pleroma/pleroma!807
lib/pleroma/user/info.ex
lib/pleroma/web/mastodon_api/mastodon_api_controller.ex
test/web/mastodon_api/mastodon_api_controller_test.exs