Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

P

pleroma
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Incidents

Snippets Groups Projects

c23bd057

Commit c23bd057 authored 6 years ago by kaniini

Downloads
- Plain Diff

Merge branch 'features/flavour-switching' into 'develop'

[MastoAPI] Add switching of frontend flavours

See merge request pleroma/pleroma!807

parents cd019a59 72a4272d

No related branches found

No related tags found

No related merge requests found

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

docs/Pleroma-API.md 14 additions, 0 deletions

docs/Pleroma-API.md
lib/pleroma/user/info.ex 9 additions, 0 deletions

lib/pleroma/user/info.ex
lib/pleroma/web/mastodon_api/mastodon_api_controller.ex 40 additions, 1 deletion

lib/pleroma/web/mastodon_api/mastodon_api_controller.ex
lib/pleroma/web/router.ex 3 additions, 0 deletions

lib/pleroma/web/router.ex
lib/pleroma/web/templates/mastodon_api/mastodon/index.html.eex 4 additions, 4 deletions

...leroma/web/templates/mastodon_api/mastodon/index.html.eex
test/web/mastodon_api/mastodon_api_controller_test.exs 25 additions, 0 deletions

test/web/mastodon_api/mastodon_api_controller_test.exs

with 95 additions and 5 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment