[tor-commits] [bridgedb/master] Merge branch 'hotfix/0.2.3-html-footer-icons' into develop

[isis at torproject.org]

commit f58f9f82a75cc471d3116116cf93961594b94c85
Merge: b2ef934 0843a7a
Author: Isis Lovecruft <isis at torproject.org>
Date:   Mon Jan 19 23:41:29 2015 +0000

    Merge branch 'hotfix/0.2.3-html-footer-icons' into develop

 lib/bridgedb/templates/base.html |   24 ++++++++++++++----------
 1 file changed, 14 insertions(+), 10 deletions(-)