git ssb

10+

Matt McKegg / patchwork



Commit 6e2c1de719b0d0a2a40ee7e23e87054149380c72

Merge pull request #511 from nrkn/master

Fixes #510
Matt McKegg authored on 4/18/2017, 12:39:56 AM
GitHub committed on 4/18/2017, 12:39:56 AM
Parent: a11c9497d075ed6b8bda770c39ff3b83868c2451
Parent: 771eb1af73b941a6f25027e5887877633428a28f

Files changed

modules/invite/sheet.jschanged
modules/profile/sheet/edit.jschanged
modules/invite/sheet.jsView
@@ -54,9 +54,9 @@
5454 showDialog({
5555 type: 'error',
5656 title: 'Error',
5757 buttons: ['OK'],
58- message: 'An error occured while attempting to redeem invite.',
58 + message: 'An error occurred while attempting to redeem invite.',
5959 detail: err.message
6060 })
6161 } else {
6262 close()
modules/profile/sheet/edit.jsView
@@ -105,9 +105,9 @@
105105 showDialog({
106106 type: 'error',
107107 title: 'Error',
108108 buttons: ['OK'],
109- message: 'An error occured while attempting to publish about message.',
109 + message: 'An error occurred while attempting to publish about message.',
110110 detail: err.message
111111 })
112112 } else {
113113 close()

Built with git-ssb-web