commit a7bfcae251c944623e98c99677d6192248a1a682 Merge: 56e8a89 9cd7a57 Author: hiro <hiro@torproject.org> Date: Fri Sep 13 22:23:10 2019 +0200 Merge branch 'master' into develop assets/static/images/dcs-logo.png | Bin 0 -> 10135 bytes lego | 2 +- templates/bottom_banner.html | 1 + 3 files changed, 2 insertions(+), 1 deletion(-)