commit 8535f4d3f2739dc26080d00d20e2048cd0336bd0 Merge: 45d6eff 4ea93b1 Author: Isis Lovecruft <isis@torproject.org> Date: Sat Apr 19 16:37:36 2014 +0000 Merge branch 'hotfix/10803-bridge-lines-newlines' into develop lib/bridgedb/templates/assets/css/custom.css | 18 ++++++++++++++++++ lib/bridgedb/templates/bridges.html | 5 +---- lib/bridgedb/test/test_HTTPServer.py | 4 ++-- 3 files changed, 21 insertions(+), 6 deletions(-)