Jay Graber 643396e67c Merge branch 'master' into 'dat' ...

# Conflicts:
#   design/preexisting/protocols/template.md

2020-06-15 17:12:50 +00:00

..

activitypub.md

Update activitypub.md

2020-05-18 00:30:31 +00:00

gun.md

Rm link

2020-06-10 17:40:56 -07:00

hypercore.md

Edit hypercore

2020-06-15 09:50:53 -07:00

IPFS.md

Add orbitdb

2020-06-09 20:39:29 -07:00

matrix.md

s/home server/homeserver

2020-06-09 20:43:45 -07:00

peergos.md

Mv peergos

2020-06-09 20:39:45 -07:00

solid.md

s/in the wild/implementations

2020-06-05 16:44:46 -07:00

ssb.md

Add line about ssb

2020-06-09 15:00:42 -07:00

template.md

Edit template

2020-06-12 19:33:38 -07:00

xmpp.md

Add network structure

2020-06-02 12:11:03 -07:00