Merge branch 'feature/django-111' into 'develop' (3f6fc95d) · Commits · Paul Walko / funkwhale · GitLab

Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

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

Snippets Groups Projects

3f6fc95d

Commit 3f6fc95d authored 7 years ago by Eliot Berriot

Downloads
- Plain Diff

Merge branch 'feature/django-111' into 'develop'

Fixed #11: Upgraded to django 1.11

Closes #11

See merge request !4

parents 37ebde38 4cb2f53d

No related branches found

No related tags found

No related merge requests found

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

.env.dev 1 addition, 1 deletion

.env.dev
api/config/api_urls.py 4 additions, 2 deletions

api/config/api_urls.py
api/funkwhale_api/music/views.py 2 additions, 1 deletion

api/funkwhale_api/music/views.py
api/requirements/base.txt 1 addition, 1 deletion

api/requirements/base.txt
api/requirements/local.txt 2 additions, 2 deletions

api/requirements/local.txt
api/requirements/test.txt 3 additions, 8 deletions

api/requirements/test.txt
dev.yml 4 additions, 3 deletions

dev.yml

with 17 additions and 18 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