[tor-commits] [webwml/master] Merge branch 'staging'

2018-06-26 Thread boklm
commit b0fac878027b3973b74efe4c1df50b8f0089e753 Merge: eaf380a9 dd6d2ed1 Author: Nicolas Vigier Date: Tue Jun 26 15:14:16 2018 +0200 Merge branch 'staging' include/versions.wmi | 1 - projects/en/torbrowser.wml | 25 - 2 files changed, 26 deletions(-)

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

2017-12-05 Thread hiro
commit 55f70bc39a9ae3012ce3c826fb3ccf847697acd5 Merge: 2a7cddc8 56d63982 Author: hiromipaw Date: Thu Nov 16 18:39:49 2017 +0100 Merge branch 'staging' of ssh://git-rw.torproject.org/project/web/webwml into staging download/en/download-easy.wml | 4 +-

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

2017-12-05 Thread hiro
commit 17f293417c8143abefebcef91921287e0c787778 Merge: 512790e7 92819ff8 Author: hiromipaw Date: Wed Nov 15 17:27:49 2017 +0100 Merge branch 'staging' of ssh://git-rw.torproject.org/project/web/webwml into staging Makefile.common | 2 +-

[tor-commits] [webwml/master] Merge branch 'staging'

2017-03-19 Thread weasel
commit 75a21b72db5519bf572a5e4a1a7a8a3e05866aea Merge: 371a8cf d4e1a35 Author: Peter Palfrader Date: Sun Mar 19 18:37:14 2017 +0100 Merge branch 'staging' * staging: Do not use onchange=, instead add listeners in init Move Debian sources.list

[tor-commits] [webwml/master] Merge branch 'staging'

2015-02-11 Thread sebastian
commit a913f039edaa066fa30b05b50246ff5d945e73ce Merge: c147121 6bfcba9 Author: Sebastian Hahn sebast...@torproject.org Date: Wed Feb 11 18:32:04 2015 +0100 Merge branch 'staging' docs/en/debian.wml | 238 ++-- 1 file changed, 231

[tor-commits] [webwml/master] Merge branch 'staging'

2015-02-07 Thread sebastian
commit dc63fc86127010eb3a1c687b0a8f3322bd067116 Merge: 63b2d91 2e30e55 Author: Sebastian Hahn sebast...@torproject.org Date: Sun Feb 8 04:28:56 2015 +0100 Merge branch 'staging' docs/en/verifying-signatures.wml |2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

[tor-commits] [webwml/master] Merge branch 'staging'

2014-12-11 Thread sebastian
commit dc9009b3741cf9f262359739e087f5eb89f23432 Merge: ab0918c 1700644 Author: Sebastian Hahn sebast...@torproject.org Date: Thu Dec 11 14:01:11 2014 +0100 Merge branch 'staging' about/en/corepeople.wml |2 +- about/en/jobs-coredev.wml|2 +-

[tor-commits] [webwml/master] Merge branch 'staging'

2014-12-10 Thread arma
commit cc71355d6b3cf82259de52aae296256d6947f257 Merge: 6e50a26 086abcf Author: Roger Dingledine a...@torproject.org Date: Wed Dec 10 13:07:31 2014 -0500 Merge branch 'staging' about/en/jobs-projectcoordinator.wml | 118 + about/en/jobs-projectmanager.wml

[tor-commits] [webwml/master] Merge branch 'staging'

2014-11-13 Thread sebastian
commit 1e4e965c1012934f5da78f47077fcc17db83c661 Merge: 995f9e3 aa38962 Author: Sebastian Hahn sebast...@torproject.org Date: Thu Nov 13 19:18:15 2014 +0100 Merge branch 'staging' Conflicts: projects/en/torbrowser.wml .gitignore | 19 +