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

modules/invite/sheet.js	changed
modules/profile/sheet/edit.js	changed

modules/invite/sheet.jsView
		@@ -54,9 +54,9 @@
54	54 …	showDialog({
55	55 …	type: 'error',
56	56 …	title: 'Error',
57	57 …	buttons: ['OK'],
58		- message: 'An error occured while attempting to redeem invite.',
	58 …	+ message: 'An error occurred while attempting to redeem invite.',
59	59 …	detail: err.message
60	60 …	})
61	61 …	} else {
62	62 …	close()
WritePreview

modules/profile/sheet/edit.jsView
		@@ -105,9 +105,9 @@
105	105 …	showDialog({
106	106 …	type: 'error',
107	107 …	title: 'Error',
108	108 …	buttons: ['OK'],
109		- message: 'An error occured while attempting to publish about message.',
	109 …	+ message: 'An error occurred while attempting to publish about message.',
110	110 …	detail: err.message
111	111 …	})
112	112 …	} else {
113	113 …	close()

Matt McKegg / patchwork