[tor-commits] [webwml/master] Fix merge conflicts in sidenav
hiro at torproject.org
hiro at torproject.org
Tue Jan 23 10:34:28 UTC 2018
commit c257c6ccac167d74206771f13d63e04335272661
Merge: 8358537e c30e7120
Author: hiromipaw <hiro at torproject.org>
Date: Tue Jan 23 11:33:17 2018 +0100
Fix merge conflicts in sidenav
about/en/contact.wml | 21 +++++++++++++++------
docs/en/openbsd.wml | 39 ---------------------------------------
docs/en/sidenav.wmi | 6 +++---
download/en/download-easy.wml | 20 ++++++++++++++++++++
js/dlpage01.js | 8 +++++---
5 files changed, 43 insertions(+), 51 deletions(-)
More information about the tor-commits
mailing list