Commits

Matthew Schinckel  committed c3e3de1 Merge

Merged in samkuehn/django-jsonfield/simplejson (pull request #11)

django.utils.simplejson is deprecated in Django 1.6; use json instead

  • Participants
  • Parent commits 49a1844, 30b6562

Comments (0)

Files changed (1)

File jsonfield/templatetags/jsonify.py

+import json
+
 from django import template
-from django.utils import simplejson as json
 from django.utils.safestring import mark_safe
 from jsonfield.utils import TZAwareJSONEncoder