commit 33499da979404bf7772545974fbdaed32e37ef73 Merge: a033b05 4bc7e9e Author: Isis Lovecruft <isis@torproject.org> Date: Tue Apr 8 15:33:39 2014 +0000 Merge branch 'fix/11346-homepage-link' into develop lib/bridgedb/templates/assets/bridgedb.png | Bin 0 -> 2946 bytes lib/bridgedb/templates/base.html | 25 ++++++++++++------------- 2 files changed, 12 insertions(+), 13 deletions(-)