[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
[tor-commits] [webwml/staging] Fix merge conflicts
commit 216b3d1b7ab1f7c138d8018f96dbfdfa3f0ef7a3
Merge: ceae9fa8 21c524ed
Author: hiro <hiro@xxxxxxxxxxxxxx>
Date: Mon Nov 5 13:53:52 2018 +0100
Fix merge conflicts
css/layout.css | 25 ++++++++++++++++---------
css/layout.min.css | 9 +++------
2 files changed, 19 insertions(+), 15 deletions(-)
_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits