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

943d1b2f

Commit 943d1b2f authored 5 years ago by kaniini

Downloads
- Plain Diff

Merge branch 'feature/user-configurable-mascot' into 'develop'

Feature: user configurable mascot

See merge request pleroma/pleroma!1177

parents 643b5634 daeae8e2

No related branches found

No related tags found

No related merge requests found

Changes 10

Hide whitespace changes

Inline Side-by-side

Showing

CHANGELOG.md 1 addition, 0 deletions

CHANGELOG.md
config/config.exs 13 additions, 0 deletions

config/config.exs
docs/api/pleroma_api.md 39 additions, 0 deletions

docs/api/pleroma_api.md
docs/config.md 10 additions, 0 deletions

docs/config.md
lib/pleroma/user.ex 20 additions, 0 deletions

lib/pleroma/user.ex
lib/pleroma/user/info.ex 9 additions, 0 deletions

lib/pleroma/user/info.ex
lib/pleroma/web/mastodon_api/mastodon_api_controller.ex 36 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
test/fixtures/sound.mp3 0 additions, 0 deletions

test/fixtures/sound.mp3
test/web/mastodon_api/mastodon_api_controller_test.exs 66 additions, 0 deletions

test/web/mastodon_api/mastodon_api_controller_test.exs

with 197 additions and 1 deletion

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