diff options
author | Hermann Schwärzler <hermann.schwaerzler@freirad.at> | 2017-07-09 19:35:22 (GMT) |
---|---|---|
committer | Hermann Schwärzler <hermann.schwaerzler@freirad.at> | 2017-07-09 19:35:22 (GMT) |
commit | cb142bb37ac70ffc93f442d928f1929e01c5b86c (patch) | |
tree | c2e5a69ee142866bb6235c6bf750545db77f067e | |
parent | d10b74d80fe0ef74c2e977d4b580d27282a9ba6c (diff) | |
parent | 003145919c386ec5ed9e2a090a12059422fdb67b (diff) |
Merge branch 'master' of https://github.com/radio-helsinki-graz/pv
-rw-r--r-- | program/models.py | 2 | ||||
-rw-r--r-- | requirements.txt | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/program/models.py b/program/models.py index 9945145..8630b35 100644 --- a/program/models.py +++ b/program/models.py @@ -1,6 +1,6 @@ from django.contrib.auth.models import User from django.core.exceptions import ObjectDoesNotExist, ValidationError, MultipleObjectsReturned -from django.core.urlresolvers import reverse +from django.urls import reverse from django.db import models from django.db.models import Q from django.utils.translation import ugettext_lazy as _ diff --git a/requirements.txt b/requirements.txt index ee6d219..a1ed722 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,6 +1,6 @@ -Django==1.9.13 +Django==1.11.2 MySQL-python==1.2.5 -Pillow==3.3.0 -PyYAML==3.11 -django-tinymce==2.3.0 -python-dateutil==2.5.3 +Pillow==4.1.1 +PyYAML==3.12 +django-tinymce==2.6.0 +python-dateutil==2.6.0 |