git ssb

Commit 60057b1f770d4e34bc1db58a793835f06125102d

Merge branch 'scry'

mixmix committed on 9/3/2018, 12:16:51 PM
Parent: a2b396459b306bb343e8333456c64d1b36baab00
Parent: 893f9408e5d346af21de04213e1411dfaedf7ee4

Files changed

main.js	changed
package-lock.json	changed
package.json	changed

main.jsView
		@@ -35,10 +35,9 @@
35	35 …	}
36	36 …
37	37 …	// from more specialized to more general
38	38 …	const sockets = combine(
39		- require('ssb-horcrux'),
40		-
	39 …	+ require('patchbay-scry'),
41	40 …	require('patchbay-dark-crystal'),
42	41 …	require('patchbay-poll'),
43	42 …	require('ssb-chess'),
44	43 …	require('patchbay-gatherings'),

package-lock.jsonView
The diff is too large to show. Use a local git client to view these changes. Old file size: 315124 bytes New file size: 315037 bytes

package.jsonView
		@@ -71,17 +71,19 @@
71	71 …	"patch-suggest": "^2.0.2",
72	72 …	"patchbay-book": "^1.0.8",
73	73 …	"patchbay-dark-crystal": "^1.0.3",
74	74 …	"patchbay-gatherings": "^2.0.2",
75		- "patchbay-poll": "^1.0.5",
	75 …	+ "patchbay-poll": "^1.0.7",
WritePreview
	76 …	+ "patchbay-scry": "^1.0.0",
76	77 …	"patchcore": "^1.28.0",
77	78 …	"pull-abortable": "^4.1.1",
78	79 …	"pull-next-query": "^1.0.0",
79	80 …	"pull-scroll": "^1.0.9",
80	81 …	"pull-stream": "^3.6.8",
81	82 …	"read-directory": "^3.0.0",
82	83 …	"require-style": "^1.0.1",
83	84 …	"scuttle-blog": "^1.0.1",
	85 …	+ "scuttle-poll": "^1.3.4",
84	86 …	"scuttlebot": "^11.4.2",
85	87 …	"setimmediate": "^1.0.5",
86	88 …	"ssb-about": "^0.1.2",
87	89 …	"ssb-backlinks": "^0.7.3",
		@@ -90,9 +92,8 @@
90	92 …	"ssb-chess-db": "^1.0.3",
91	93 …	"ssb-config": "^2.2.0",
92	94 …	"ssb-ebt": "^5.2.2",
93	95 …	"ssb-friends": "^3.1.3",
94		- "ssb-horcrux": "^1.0.0",
95	96 …	"ssb-keys": "^7.0.15",
96	97 …	"ssb-meme": "^1.0.4",
97	98 …	"ssb-mentions": "^0.5.0",
98	99 …	"ssb-mutual": "^0.1.0",

Built with git-ssb-web