Jay Graber ab22967cbf Merge branch 'master' into 'network-structure' ... # Conflicts: # design/preexisting/protocols/template.md		2020-06-02 23:00:18 +00:00
..
IPFS.md	IPFS	2020-05-18 00:44:18 +00:00
activitypub.md	Update activitypub.md	2020-05-18 00:30:31 +00:00
gun.md	Update gun.md	2020-05-31 22:30:15 +00:00
hypercore.md	Dat has been renamed hypercore	2020-05-26 19:29:29 -07:00
i2p.md	Add new file	2020-06-01 01:42:43 +00:00
matrix.md	Update matrix.md	2020-05-18 00:29:35 +00:00
solid.md	Update solid.md	2020-05-27 23:40:58 +00:00
ssb.md	Update ssb.md	2020-05-18 00:18:34 +00:00
template.md	Add drafts	2020-06-02 14:15:31 -07:00
xmpp.md	Add network structure	2020-06-02 12:11:03 -07:00