commit 92550c7544109d181ef3bd12eb721d1f90e7b094
Merge: 10c27b5 ab06e0d
Author: hiro <[email protected]>
Date: Mon Feb 11 12:40:04 2019 +0100
Fix merge conflicts
content/thank-you/contents.lr | 15 +++++++++++++++
databags/menu+en.ini | 16 ++++++----------
databags/menu+es.ini | 16 ++++++----------
databags/menu+fr.ini | 16 ++++++----------
templates/contact.html | 6 +++---
templates/download-options.html | 5 +++++
templates/thank-you.html | 21 +++++++++++++++++++++
7 files changed, 62 insertions(+), 33 deletions(-)
_______________________________________________
tor-commits mailing list
[email protected]
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
