[tor-commits] [community/develop] update develop with master changes

[emmapeel at torproject.org]

commit f5571fd0a1e5cb7a769d20eae980fec23b924a98
Merge: e4e4108 ee60633
Author: emma peel <emma.peel at riseup.net>
Date:   Sat Oct 5 09:39:20 2019 +0200

    update develop with master changes

 content/user-research/become-tester/contents.lr | 22 ++++++++++
 content/user-research/contents.lr               | 10 ++---
 content/user-research/current/contents.lr       | 19 ---------
 content/user-research/open/contents.lr          | 54 +++++++++++++++++++++++++
 content/user-research/signup/contents.lr        | 19 ---------
 content/user-testing/current/contents.lr        | 19 ---------
 content/user-testing/signup/contents.lr         | 19 ---------
 databags/pagenav+en.ini                         |  4 ++
 lego                                            |  2 +-
 templates/user-research.html                    | 28 ++++++-------
 10 files changed, 99 insertions(+), 97 deletions(-)