Merge branch '872-additional-settings' into 'develop' (c2f0491c) · Commits · Martin Giger / funkwhale · GitLab

Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

funkwhale
- Activity
- Members
- Labels
- Issues
  0
- Issue boards
- Milestones
- Wiki
- Environments
- Terraform modules
- Incidents
- Service Desk

Snippets Groups Projects

c2f0491c

Commit c2f0491c authored 5 years ago by Eliot Berriot

Downloads
- Plain Diff

Merge branch '872-additional-settings' into 'develop'

See #872: rules and contact email settings

See merge request funkwhale/funkwhale!898

parents 853cd833 dce7a74f

No related branches found

No related tags found

No related merge requests found

Changes 4

Hide whitespace changes

Inline Side-by-side

Showing

api/funkwhale_api/instance/dynamic_preferences_registry.py 23 additions, 0 deletions

api/funkwhale_api/instance/dynamic_preferences_registry.py
api/funkwhale_api/instance/nodeinfo.py 2 additions, 0 deletions

api/funkwhale_api/instance/nodeinfo.py
api/tests/instance/test_nodeinfo.py 4 additions, 0 deletions

api/tests/instance/test_nodeinfo.py
front/src/views/admin/Settings.vue 2 additions, 0 deletions

front/src/views/admin/Settings.vue

with 31 additions and 0 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