commit 79d2298593e9fe95211972a271cc671ad910162e
Merge: 048de3fe 232e4645
Author: hiromipaw
Date: Tue Dec 26 11:19:36 2017 +0100
Merge branch 'master' of ssh://git-rw.torproject.org/project/web/webwml
into 24720+1
___
tor-commits mailing list
commit 75fda3eccd77d5f6926cc29af88df57c76a7752b
Merge: 253932f5 232e4645
Author: hiromipaw
Date: Tue Dec 26 11:14:19 2017 +0100
Merge branch 'master' of ssh://git-rw.torproject.org/project/web/webwml
into 24673
.htaccess | 3 ++-
Makefile
commit 753c7af4b1d892c8b6397a47daac4e4968298dc0
Merge: 4771d7fe 86a86d75
Author: hiromipaw
Date: Wed Dec 20 11:47:04 2017 +0100
Merge branch 'master' of ssh://git-rw.torproject.org/project/web/webwml
include/versions.wmi | 4 ++--
projects/torbrowser/RecommendedTBBVe
commit 8e385ca3d5e8809a91fb4f225d7375c7180480d6
Merge: f98b7fd5 34c7baf2
Author: hiromipaw
Date: Thu Dec 14 19:59:13 2017 +0100
Merge branch 'master' of ssh://git-rw.torproject.org/project/web/webwml
into faq-section-anchors
.gitignore | 4 +-
Makefile.c
commit 99f445f943b9abec3677b5af9931c629657a55a8
Merge: f87eea1a 53990269
Author: hiromipaw
Date: Wed Dec 13 16:16:38 2017 +0100
Merge branch 'master' of ssh://git-rw.torproject.org/project/web/webwml
into faq-hrefs-for-anchors
.gitignore | 4 +-
Makefile
commit c69eb984b93efb9779dd867787098b67f663852e
Merge: 1731e62d 3f17add4
Author: hiromipaw
Date: Mon Nov 27 20:41:21 2017 +0100
Merge branch 'master' of ssh://git-rw.torproject.org/project/web/webwml
about/en/contributors.wml | 3 -
about/en/corepeople.wml | 152 ++
commit 472321a51e20d0388e8f0ed48f5ac443684efe94
Merge: 0f20850a 0e11d089
Author: hiromipaw
Date: Wed Nov 22 18:22:50 2017 +0100
Merge branch 'master' of ssh://git-rw.torproject.org/project/web/webwml
Makefile | 2 +-
include/versions.wmi | 2 +-
2 files changed, 2 insertions(+
commit 05ccf93e942a2d5ce59aa317055024d42ea1b737
Merge: bfe079ed ebd9653e
Author: hiromipaw
Date: Fri Oct 27 19:44:48 2017 +0200
Merge branch 'master' of ssh://git-rw.torproject.org/project/web/webwml
Makefile | 2 +-
include/versions.wmi | 2 +-
2 files changed, 2 insertions(+
commit 41fdb8a7b32967655408b3858f2238436c5c7481
Merge: c73adcb5 3d72cf7f
Author: hiromipaw
Date: Thu Oct 19 13:45:47 2017 +0200
Merge branch 'master' of ssh://git-rw.torproject.org/project/web/webwml
about/en/corepeople.wml | 47 ++-
about/en/spons
commit 616edbb9b49fe160dd517fde066b472390548536
Merge: 1b806313 88b17d9e
Author: hiromipaw
Date: Thu Sep 7 15:56:40 2017 +0200
Merge branch 'master' of ssh://git-rw.torproject.org/project/web/webwml
Makefile | 2 +-
include/versions.wmi
commit 7bf7ad9ebe1628193b1c5f9e3f2a455fd6fd282e
Merge: 646ccefe 52c29243
Author: hiromipaw
Date: Mon Aug 14 14:39:21 2017 +0200
Merge branch 'master' of ssh://git-rw.torproject.org/project/web/webwml
into staging
about/en/corepeople.wml| 2 +-
about/en/sponsors.wml
commit 7e3fccb40a7c619f44845b5495bfab411141b777
Merge: e670475b 52c29243
Author: hiromipaw
Date: Thu Aug 24 16:21:48 2017 +0200
Merge branch 'master' of ssh://git-rw.torproject.org/project/web/webwml
about/en/corepeople.wml| 2 +-
about/en/sponsors.wml
commit 1cfaef279fc3242e1396e7924ac7388d7ca302f7
Merge: a085cc07 1a9bc4f0
Author: hiromipaw
Date: Mon Aug 7 18:49:00 2017 +0200
Merge branch 'master' of ssh://git-rw.torproject.org/project/web/webwml
Makefile | 4 +-
about/en/corepeople.wml
commit 2131b93aa996ca3bfed42f47f93cbd84473fbf70
Merge: f5b2e3f6 f673f594
Author: hiromipaw
Date: Fri Jul 14 16:19:29 2017 +0200
Merge branch 'master' of ssh://git-rw.torproject.org/project/web/webwml
about/en/contributors.wml |6 +
about/en/corepeople.wml |6 -
a
commit 5085745050fa26e1531412311c7b34c5fc287cba
Merge: e8e32970 49d099e0
Author: hiromipaw
Date: Mon Jul 10 10:30:30 2017 +0200
Merge branch 'master' of ssh://git-rw.torproject.org/project/web/webwml
about/en/corepeople_alternate.wml | 317 ++
images/people/arthuredelstein.png
commit ad8e63b801003d4504b24a852c168ee98abcb815
Merge: 3f2a2cc9 bdf9077e
Author: hiromipaw
Date: Mon Jul 10 19:31:27 2017 +0200
Merge branch 'master' of ssh://git-rw.torproject.org/project/web/webwml
about/en/corepeople_alternate.wml | 43 +-
images/people/hiro.png| Bin 0 -
commit 38c1f31e18931e524fb4ca20d64dc39b4681967d
Merge: 9ecbc332 aff22490
Author: hiromipaw
Date: Mon Jul 3 09:40:00 2017 +0200
Merge branch 'master' of ssh://git-rw.torproject.org/project/web/webwml
docs/debian-selector.js | 20 ++--
1 file changed, 10 insertions(+), 10 de
commit 682e105973f7ef3e74512d1eedb101ece4fdcf48
Merge: d4f2145 98f29cb
Author: hiromipaw
Date: Sat Jul 1 09:57:11 2017 +0200
Merge branch 'master' of ssh://git-rw.torproject.org/project/web/webwml
into staging
Makefile | 4 ++--
include/versions.wmi | 4 ++--
2 files changed,
commit 477c6d8cd697922446ca9ed7fc2c2894e930c608
Merge: e4c7725 25ec054
Author: hiromipaw
Date: Fri Jun 16 20:38:20 2017 +0200
Merge branch 'master' of ssh://git-rw.torproject.org/project/web/webwml
into staging
projects/torbrowser/RecommendedTBBVersions | 12
1 file changed,
commit 599051d2bc74011d44f78b7bc7399b90c949dde0
Merge: 4593792 630a318
Author: hiromipaw
Date: Mon Apr 10 11:43:59 2017 +0200
Merge branch 'master' of ssh://git-rw.torproject.org/project/web/webwml
Makefile | 2 +-
include/versions.wmi | 2 +-
2 files changed, 2 insertions(+),
commit 45863aab95581b938ef7d55fa1e8cc41892a33a6
Merge: b718b34 7ae390e
Author: hiromipaw
Date: Thu Jan 26 15:32:42 2017 +0100
Merge branch 'master' of ssh://git-rw.torproject.org/project/web/webwml
projects/torbrowser/RecommendedTBBVersions | 10 --
1 file changed, 10 deletions(-)
commit e27390e76ca3ffdb6981067fe7ed4ac5f0854943
Merge: 1f0363b fd8c847
Author: hiromipaw
Date: Wed Jan 25 17:17:44 2017 +0100
Merge branch 'master' of ssh://git-rw.torproject.org/project/web/webwml
Makefile | 4 +-
include/lang.wmi
commit fd56b785c6300a0b675bcd30424c6a3c67472b9f
Merge: fea31a2 5628d54
Author: Roger Dingledine
Date: Mon May 4 22:35:33 2015 -0400
Merge branch 'master' of ssh://git-rw.torproject.org/project/web/webwml
Conflicts:
press/en/info.wmi
Makefile
commit baa57e39a0bb020d7db1bd7b9bb43d0510c620cb
Merge: 91d79dd 4ac2940
Author: Andrew Lewman
Date: Tue Mar 17 13:17:18 2015 -0400
Merge branch 'master' of ssh://git-rw.torproject.org/project/web/webwml
Makefile |2 +-
include/versions.wmi |2 +-
2 files changed, 2 inse
commit fc6478c74d0f541797c4d592c4e5095799e2ce92
Merge: 684578d a1ae777
Author: Andrew Lewman
Date: Tue Jan 6 11:47:35 2015 -0500
Merge branch 'master' of ssh://git-rw.torproject.org/project/web/webwml
about/en/gsoc.wml |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
__
commit b39fa85f3865c5672d32857aa1b4d20d6de334aa
Merge: d32bc78 cdb2483
Author: Andrew Lewman
Date: Mon Nov 24 11:52:19 2014 -0500
Merge branch 'master' of ssh://git-rw.torproject.org/project/web/webwml
projects/en/sampleproject.wml | 25 -
1 file changed, 25 dele
commit abb69c55fb4b43ca9612ac833b2d01f7f0d5c794
Merge: c106733 02a1457
Author: Andrew Lewman
Date: Wed Nov 19 10:00:51 2014 -0500
Merge branch 'master' of ssh://git-rw.torproject.org/project/web/webwml
include/versions.wmi |2 +-
projects/en/torbrowser.wml | 62 +++
27 matches
Mail list logo