portability form Django-1.9
portability form Django-1.9

# Conflicts:
#	shop/models/order.py

awesto/django-shop,khchine5/django-shop,nimbis/django-shop,jrief/django-shop,nimbis/django-shop,khchine5/django-shop,jrief/django-shop,nimbis/django-shop,divio/django-shop,nimbis/django-shop,divio/django-shop,jrief/django-shop,awesto/django-shop,jrief/django-shop,khchine5/django-shop,divio/django-shop,khchine5/django-shop,awesto/django-shop