Merge branch 'feature/fe-configuration' into 'develop'
authorlambda <pleromagit@rogerbraun.net>
Thu, 19 Jul 2018 07:31:10 +0000 (07:31 +0000)
committerlambda <pleromagit@rogerbraun.net>
Thu, 19 Jul 2018 07:31:10 +0000 (07:31 +0000)
commit6f23fb53d36f93ffd0c8776778de4caf9dd80036
treecbcfba6209c9a300b4e64930dba4e1500f542407
parentb7001ea9e72947596b60e080768be10b4cbae82b
parent2b3f049b06aa2d248028890bd8fdfbeb9e1e279e
Merge branch 'feature/fe-configuration' into 'develop'

serverside frontend configuration

See merge request pleroma/pleroma!256
lib/pleroma/web/mastodon_api/mastodon_api_controller.ex