Skip to content

half-baked PR #17

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion backend/settings/common.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
from sys import path
from os.path import join

from django.core.urlresolvers import reverse_lazy
from django.urls import reverse_lazy

# Build paths inside the project like this: os.path.join(BASE_DIR, ...)
BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
Expand Down
3 changes: 2 additions & 1 deletion backend/urls.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
from django.conf.urls import url, include
from django.contrib.auth.views import login, logout_then_login
from django.contrib.auth import login
from django.contrib.auth.views import logout_then_login
from django.contrib import admin

from .views import app, index
Expand Down
2 changes: 1 addition & 1 deletion backend/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

from django.contrib.auth.decorators import login_required
from django.conf import settings
from django.core.urlresolvers import reverse
from django.urls import reverse
from django.shortcuts import render, redirect


Expand Down