[tor-commits] [tpo/staging] Merge branch 'master' into 'master'

2020-07-27 Thread hiro
commit 992048474405c20504f8528bdd93bdb39568caae Merge: 45325bd0 647c3f8d Author: Antonela Date: Mon Jul 27 13:51:28 2020 + Merge branch 'master' into 'master' Rebase master See merge request antonela/tpo!2 assets/static/images/membership/green.png | Bin 0

[tor-commits] [tpo/staging] Merge branch 'master' into 'master'

2020-07-20 Thread gus
commit 45325bd07147bafbcbbd4dba662f544a53aef25c Merge: 8b6151b5 f4bad6a2 Author: Antonela Date: Mon Jul 20 13:35:14 2020 + Merge branch 'master' into 'master' Master See merge request antonela/tpo!1 .github/FUNDING.yml|3 +

[tor-commits] [tpo/staging] Merge branch 'master' into master

2019-05-29 Thread emmapeel
commit b7d1e5f56e83827b539cad1a3fe3584c745c4152 Merge: 59a96c3 a0931ab Author: Antonela Date: Fri Apr 26 10:07:31 2019 -0300 Merge branch 'master' into master content/about/people/boklm/contents.lr| 2 +- content/about/people/ewyatt/contents.lr | 2 +-

[tor-commits] [tpo/staging] Merge branch 'master' into master

2019-04-06 Thread emmapeel
commit 7918445fe7278ed0d932d14fa8adc30ba9c770a5 Merge: cdf2cea 028a442 Author: Antonela Date: Wed Mar 27 11:48:24 2019 -0300 Merge branch 'master' into master .htaccess | 6 +++--- content/about/sponsors/DARPA-penn/contents.lr | 2 +- 2 files changed,

[tor-commits] [tpo/staging] Merge branch 'master' into master

2019-02-07 Thread hiro
commit e54786e39077a7901f4587854316a690b7feb7f1 Merge: 3a52e28 780e6eb Author: Antonela Date: Thu Feb 7 16:11:44 2019 +0200 Merge branch 'master' into master .../about/jobs/backend-engineer-ooni/contents.lr | 5 ++ content/about/jobs/browser-developer/contents.lr | 6 +++