torproject/community
1
0
Fork 0
mirror of https://github.com/torproject/community.git synced 2024-12-12 20:45:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Revert previous commit and fix conflicts

Browse Source
This commit is contained in:
hiro 2019-10-21 18:21:09 +02:00
parent b2df2aa3ca
commit 89f7bff151
2 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
content/user-research/become-tester/contents.lr
View File

@ -10,8 +10,4 @@ key: 1
--- ---
_hidden: yes _hidden: yes
--- ---
_template: layout.html
---
html: two-columns-page.html
---
body: body:

1
content/user-research/guidelines/contents.lr
View File

@ -8,6 +8,7 @@ title: User Research Guidelines
--- ---
subtitle: We collect only necessary data to improve our services. subtitle: We collect only necessary data to improve our services.
--- ---
>>>>>>> parent of 1e624ba... update content status
key: 3 key: 3
--- ---
html: two-columns-page.html html: two-columns-page.html