1. Andrew Wooster
  2. biplist

Commits

Kevin Kelley  committed 25a097c Merge with conflicts

Merge remote-tracking branch 'upstream/master'

(We already added the 'b' to file modes to make py3k happy, so the
upstream commit doesn't really change anything.)

Conflicts:
biplist/__init__.py

  • Participants
  • Parent commits aedd1fa, 156bd03
  • Branches master

Comments (0)