commit aa835c1d9155c5139950a4e35d76bf6cfb295415
Merge: a2aec59 46ff7aa
Author: Isis Lovecruft <[email protected]>
Date: Thu Feb 6 05:41:56 2014 +0000
Merge branch 'testing/tpo-sysrqb/bug9127' into develop
lib/bridgedb/HTTPServer.py | 55 +++++++++++++++++++++++++++++++----
lib/bridgedb/templates/base.html | 5 ++++
lib/bridgedb/templates/index.html | 11 +++----
lib/bridgedb/templates/options.html | 39 +++++++++++++++++++++++++
4 files changed, 98 insertions(+), 12 deletions(-)
_______________________________________________
tor-commits mailing list
[email protected]
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
