commit f1bdddb8f00bfb0e5abaf387d37ec811a544448d Merge: ff37a14 c542e05 Author: Isis Lovecruft isis@torproject.org Date: Mon Feb 2 19:23:47 2015 +0000

Merge branch 'fix/14064-bridgeline-wrapping_r2' into develop

lib/bridgedb/templates/assets/css/custom.css | 41 ++++++++++++++++++++++++-- 1 file changed, 38 insertions(+), 3 deletions(-)