git ssb - Merge branch 'master' of https://github.com/ssbc/patchwork

package-lock.json	changed
package.json	changed

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

package.jsonView
		@@ -14,9 +14,9 @@
14	14 …	},
15	15 …	"author": "Secure Scuttlebutt Consortium",
16	16 …	"license": "AGPL-3.0",
17	17 …	"dependencies": {
18		- "app-root-path": "^2.0.1",
	18 …	+ "app-root-path": "^2.1.0",
19	19 …	"bulk-require": "^1.0.1",
20	20 …	"compare-version": "^0.1.2",
21	21 …	"cross-script": "^1.0.5",
22	22 …	"deep-equal": "^1.0.1",
		@@ -28,9 +28,9 @@
28	28 …	"emoji-named-characters": "^1.0.2",
29	29 …	"emojilib": "^2.2.12",
30	30 …	"escape-string-regexp": "^1.0.5",
31	31 …	"fix-path": "^2.1.0",
32		- "flatpickr": "^4.4.6",
	32 …	+ "flatpickr": "^4.5.1",
33	33 …	"flumeview-level": "^3.0.4",
34	34 …	"flumeview-reduce": "^1.3.13",
35	35 …	"flumeview-search": "^1.0.3",
36	36 …	"hashlru": "^2.2.1",
		@@ -39,9 +39,9 @@
39	39 …	"level": "^4.0.0",
40	40 …	"lrucache": "^1.0.3",
41	41 …	"micro-css": "^2.0.1",
42	42 …	"moment": "^2.22.1",
43		- "moment-timezone": "^0.5.17",
	43 …	+ "moment-timezone": "^0.5.21",
44	44 …	"mutant": "^3.22.1",
45	45 …	"mutant-pull-reduce": "^1.1.0",
46	46 …	"obv": "0.0.1",
47	47 …	"patch-settings": "^1.1.2",
		@@ -85,8 +85,8 @@
85	85 …	"xtend": "^4.0.1"
86	86 …	},
87	87 …	"devDependencies": {
88	88 …	"colors": "^1.2.5",
89		- "electron": "^2.0.0",
	89 …	+ "electron": "^2.0.4",
90	90 …	"node-gyp": "^3.6.2"
91	91 …	}
92	92 …	}

Matt McKegg / patchwork