views.py
749 Bytes
-
Merge branch 'EnTeQuAk-py3k' · 08579a12
Conflicts: MANIFEST.in docs/changelog.txt docs/index.txt setup.py taggit/tests/tests.py
Florian Apolloner committed
Conflicts: MANIFEST.in docs/changelog.txt docs/index.txt setup.py taggit/tests/tests.py