commit ff37a1408fbc8b0972c48a2270c2e82b8cc21ca5
Merge: d6115a8 d8b9815
Author: Isis Lovecruft <[email protected]>
Date: Mon Feb 2 19:06:24 2015 +0000
Merge branch 'fix/12664-bridgeline-newlines_r2' into develop
lib/bridgedb/templates/assets/css/custom.css | 3 +-
lib/bridgedb/templates/base.html | 13 ++--
lib/bridgedb/templates/bridges.html | 82 ++++++++++++++++++++++----
lib/bridgedb/test/test_HTTPServer.py | 10 +++-
4 files changed, 85 insertions(+), 23 deletions(-)
_______________________________________________
tor-commits mailing list
[email protected]
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
