← Back to branch summary

~jonnyjd/python-discid/master

Viewing all changes in revision 164.

  • Committer: Johannes Dewender
  • Date: 2013-10-07 21:50:22 UTC
  • mfrom: (161.1.3)
  • Revision ID: git-v1:8eaeaac70d0855e2ea3e33f88b94f5a99f1de3e1
Merge branch 'toc_string'

see pull request #36

Conflicts:
        test_discid.py

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: