Skip to content
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

Django 1.7 support #45

Merged
merged 1 commit into from
May 26, 2014
Merged

Conversation

danmac-uk
Copy link
Contributor

Django 1.7 removes StrAndUnicode from django.utils.encoding, as specified here:
https://docs.djangoproject.com/en/1.6/releases/1.5/#django-utils-encoding-strandunicode

So, I did what it said, and now it goes again, on my machine with my Django project :)

tiliv added a commit that referenced this pull request May 26, 2014
@tiliv tiliv merged commit 53c3128 into pivotal-energy-solutions:master May 26, 2014
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants