Commit Graph

106 Commits

Author SHA1 Message Date
Jay Graber 6ee50d7b6d Ian's edits peergos 2020-06-15 17:03:03 -07:00
Jay Graber 2e2ff2f3e6 Add contributors to overview 2020-06-15 17:01:25 -07:00
Jay Graber f8fcbe858a Merge branch 'mastodon' into 'master'
Mastodon

See merge request arnoldjun/bluesky!66
2020-06-15 20:51:49 +00:00
Jay Graber 9272e741da fix typo 2020-06-15 13:45:08 -07:00
Jay Graber e3b0e21fff Update peergos 2020-06-15 13:43:06 -07:00
Jay Graber 2bbaa6aad7 edit ssb 2020-06-15 12:51:38 -07:00
Jay Graber e22b600c8d Edit ssb 2020-06-15 12:50:36 -07:00
Jay Graber dda8d1cd7d Edit ssb, add link to gun 2020-06-15 12:27:04 -07:00
Jay Graber a2ad7de88f Merge branch 'ipfs' into 'master'
Ipfs

See merge request arnoldjun/bluesky!71
2020-06-15 17:16:47 +00:00
Jay Graber 2e3bc51f6f Add node count 2020-06-15 10:16:25 -07:00
Jay Graber 643396e67c Merge branch 'master' into 'dat'
# Conflicts:
#   design/preexisting/protocols/template.md
2020-06-15 17:12:50 +00:00
Jay Graber efdcb303fd Edit hypercore 2020-06-15 09:50:53 -07:00
Jay Graber 2e81f063a3 Add info 2020-06-12 21:19:04 -07:00
Jay Graber 4c577809a5 Add contributors ref 2020-06-12 19:34:22 -07:00
Jay Graber 48a81d7023 Edit template 2020-06-12 19:33:38 -07:00
Jay Graber d787718220 Add hypercore info 2020-06-12 19:33:33 -07:00
Jay Graber ae38d247fb Rm topology desc 2020-06-12 15:40:43 -07:00
Jay Graber 1ccc0a9704 Edited IPFS summary 2020-06-12 15:25:38 -07:00
Jay Graber f987bab520 Rm github stars 2020-06-11 21:13:15 -07:00
Golda Velez eb350b6d8d Update governance.md (WIP) 2020-06-11 04:38:33 +00:00
Jay Graber 94050848c3 Merge branch 'gun' into 'master'
Gun

See merge request arnoldjun/bluesky!69
2020-06-11 00:42:17 +00:00
Jay Graber 2aa205850b Rm link 2020-06-10 17:40:56 -07:00
Jay Graber 52eba2a8b0 Edit 2020-06-10 17:38:00 -07:00
Jay Graber 4b9a5a3565 Edits 2020-06-10 17:35:45 -07:00
Jay Graber 27467776f6 Edit 2020-06-10 15:43:58 -07:00
Jay Graber 534c1faf31 edit 2020-06-09 21:58:27 -07:00
Jay Graber a54d68d712 Rm i2p 2020-06-09 20:55:59 -07:00
Jay Graber 4efda5aaca s/home server/homeserver 2020-06-09 20:43:45 -07:00
Jay Graber 3774ba3a52 Edit 2020-06-09 20:42:00 -07:00
Jay Graber 50363dad0a Edit 2020-06-09 20:42:00 -07:00
Jay Graber f9545eab3e Finish Matrix overview 2020-06-09 20:41:58 -07:00
Jay Graber 0b22175ad4 Add stubs 2020-06-09 20:40:20 -07:00
Jay Graber c13d3fbba1 Mv peergos 2020-06-09 20:39:45 -07:00
Jay Graber 20b24f026b Add orbitdb 2020-06-09 20:39:29 -07:00
Jay Graber c6b4053efe Add line about ssb 2020-06-09 15:00:42 -07:00
Jay Graber 513e07bc26 Edit gun 2020-06-09 14:30:21 -07:00
Jay Graber 4e58f74366 Add 2019 study 2020-06-08 11:49:09 -07:00
Jay Graber 39997a25f5 Edit gun 2020-06-08 11:40:05 -07:00
Golda Velez be67828ee4 Merge branch 'gvelez_add_iris' into 'master'
Update iris.md

See merge request arnoldjun/bluesky!56
2020-06-08 00:54:40 +00:00
Jay Graber 85863e508b Rm line 2020-06-05 16:51:28 -07:00
Jay Graber 5eafe7036a s/in the wild/implementations 2020-06-05 16:44:46 -07:00
Jay Graber 1ecc88168b More edits 2020-06-05 16:16:56 -07:00
Jay Graber 5cf7bb49cf Edit 2020-06-05 15:59:39 -07:00
Jay Graber d9ebf60894 Add keybase issue link 2020-06-05 11:59:49 -07:00
Jay Graber f39b2349db Add moderation critique 2020-06-05 11:57:51 -07:00
Jay Graber a86f2993d5 Improve mastodon section 2020-06-05 10:42:50 -07:00
Jay Graber 095e8b557f Merge branch 'master' into 'ssb'
# Conflicts:
#   design/preexisting/protocols/template.md
2020-06-05 16:42:44 +00:00
Jay Graber 54ef767f97 Finish madstodon 2020-06-05 09:41:34 -07:00
Jay Graber 19d3f55caa Add diaspora 2020-06-03 18:42:40 -07:00
Jay Graber d2f864ecad Merge branch 'zeronet' into 'master'
Finish zeronet

See merge request arnoldjun/bluesky!64
2020-06-04 01:35:47 +00:00