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

commit 7966c0d197d74c7f5da1f30077a90e5e826b3391 Merge: ae36d114 84975216 Author: hiro Date: Mon Jul 27 21:00:25 2020 +0200 Merge branch 'staging' templates/membership.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ___ tor-commits

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

commit 530331a95807603311a9dafe6ecbe5a623fd0d8e Merge: 5b6be9a d4e4a5a Author: hiro Date: Thu Jan 17 16:13:46 2019 +0100 Merge branch 'staging' configs/i18n.ini | 3 ++- content/about/history/contents.lr | 25 + content/abo

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

commit a6080d65771fe3d697ec878bae5c336ddf52c93a Merge: 79be3c2 4a343b8 Author: hiro Date: Thu Mar 14 15:24:46 2019 +0100 Merge branch 'staging' configs/i18n.ini | 4 +-- content/about/contents.lr| 4 +-- content/about/history/contents.lr

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

commit bb88289eb7dd8a7c784fa6c97ecbb35cc2b2ab1c Merge: 5a33f45 a4d5bfa Author: hiro Date: Tue Mar 26 14:31:50 2019 +0100 Merge branch 'staging' databags/about+ko.ini | 1 + databags/menu+bn-BD.ini | 2 +- databags/menu+de.ini| 2 +- databags/menu+en.ini| 2 +-

[tor-commits] [tpo/staging] Merge branch 'staging' of git-rw.torproject.org:project/web/tpo into staging

commit c19627b70543c86a6e0592a8edaaa9754a11cc63 Merge: 185acdd0 323d5aa1 Author: gus Date: Thu Aug 20 16:15:41 2020 -0400 Merge branch 'staging' of git-rw.torproject.org:project/web/tpo into staging assets/static/images/membership/header.png | Bin 0 -> 334841 bytes assets/static/

[tor-commits] [tpo/staging] Merge branch 'staging' of git-rw.torproject.org:project/web/tpo into staging

commit 170cacac58f7bf6afefcd6dc721c76146b2bf504 Merge: b2470a7 d71e156 Author: hiro Date: Mon Mar 25 15:53:21 2019 +0100 Merge branch 'staging' of git-rw.torproject.org:project/web/tpo into staging content/about/sponsors/bbg/contents.lr | 2 +- content/about/sponsors/hrw/contents.lr | 2

[tor-commits] [tpo/staging] Merge branch 'staging' of git-rw.torproject.org:project/web/tpo into staging

commit b081b7e45bd1a08d1c4c00c55aa0a802e1d003d2 Merge: e5b5483 b318b4f Author: hiro Date: Mon Jan 21 15:22:50 2019 +0100 Merge branch 'staging' of git-rw.torproject.org:project/web/tpo into staging .../jobs/developer-data-architect/contents.lr | 57 .../jobs/senior-s

[tor-commits] [tpo/staging] Merge branch 'staging' of https://git.torproject.org/project/web/tpo into HEAD

commit 697c133324f1e25fe5385c4b7c6349ccb8a5f03d Merge: 570885b b70c483 Author: emma peel Date: Wed Feb 6 17:25:49 2019 +0100 Merge branch 'staging' of https://git.torproject.org/project/web/tpo into HEAD templates/about.html | 4 ++-- templates/contact.html | 34 +++---

[tor-commits] [tpo/staging] Merge branch 'staging' of https://git.torproject.org/project/web/tpo into staging

commit 45eff7a528b747fcf7798b692e6475196bcccd71 Merge: 7363ba4 48532f9 Author: emma peel Date: Tue Feb 12 11:17:06 2019 +0100 Merge branch 'staging' of https://git.torproject.org/project/web/tpo into staging content/about/people/moritz/contents.lr | 2 -- content/thank-you/contents.lr

[tor-commits] [tpo/staging] Merge branch 'staging' of https://git.torproject.org/project/web/tpo into staging

commit 11e3e7fe44593b3e97ca7c16d907a9dfb1016cfc Merge: ed47749 62f7063 Author: emma peel Date: Tue Feb 12 12:55:59 2019 +0100 Merge branch 'staging' of https://git.torproject.org/project/web/tpo into staging databags/versions.ini | 12 ++-- 1 file changed, 6 insertions(+), 6 dele

[tor-commits] [tpo/staging] Merge branch 'staging' of https://git.torproject.org/project/web/tpo into staging

commit e8d695e9b91a459e3bfba4f90cb292e8ede63cff Merge: 0edb2a7 c8ccd63 Author: emma peel Date: Sat Mar 2 02:51:03 2019 +0100 Merge branch 'staging' of https://git.torproject.org/project/web/tpo into staging .gitignore | 3 ++ assets/scss/_tor.scss

[tor-commits] [tpo/staging] Merge branch 'staging' of https://git.torproject.org/project/web/tpo into staging

commit be17fa93f73e9ccf59d2c35aaad06e6a7d803bf5 Merge: e8d695e c653f05 Author: emma peel Date: Wed Mar 6 02:18:47 2019 +0100 Merge branch 'staging' of https://git.torproject.org/project/web/tpo into staging assets/scss/_portal.scss |2 - assets/scss/_tor.scs

[tor-commits] [tpo/staging] Merge branch 'staging' of https://git.torproject.org/project/web/tpo into staging

commit e8d695e9b91a459e3bfba4f90cb292e8ede63cff Merge: 0edb2a7 c8ccd63 Author: emma peel Date: Sat Mar 2 02:51:03 2019 +0100 Merge branch 'staging' of https://git.torproject.org/project/web/tpo into staging .gitignore | 3 ++ assets/scss/_tor.scss

[tor-commits] [tpo/staging] Merge branch 'staging' of https://git.torproject.org/project/web/tpo into staging

commit c3597fcb5da9080513f98090ad98aee327864a80 Merge: 99ce17e 9397a07 Author: emma peel Date: Thu Mar 7 13:28:53 2019 +0100 Merge branch 'staging' of https://git.torproject.org/project/web/tpo into staging templates/download.html | 11 +++ templates/macros/people.html | 4

[tor-commits] [tpo/staging] Merge branch 'staging' of https://git.torproject.org/project/web/tpo into staging

commit be17fa93f73e9ccf59d2c35aaad06e6a7d803bf5 Merge: e8d695e c653f05 Author: emma peel Date: Wed Mar 6 02:18:47 2019 +0100 Merge branch 'staging' of https://git.torproject.org/project/web/tpo into staging assets/scss/_portal.scss |2 - assets/scss/_tor.scs