commit 238b1536dbcf0e4344f097e62aa574a64844fa73
Merge: 530f2b3 4c81926
Author: Isis Lovecruft <[email protected]>
Date: Thu May 1 00:34:09 2014 +0000
Merge branch 'hotfix/requirements-travis' into develop
.travis.yml | 7 ++-----
Makefile | 6 +++++-
lib/bridgedb/util.py | 40 ++++++++++++++++++++++++----------------
requirements.txt | 3 ---
4 files changed, 31 insertions(+), 25 deletions(-)
_______________________________________________
tor-commits mailing list
[email protected]
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
