10 commits

Author	SHA1	Message	Date
botanic	bdff3eb81a	fixed change email on shard	2014-09-03 00:23:47 -07:00
botanic	a162da4479	Merge	2014-09-02 23:26:53 -07:00
botanic	a7cfa39ff0	Fix add user in settings	2014-09-02 23:24:41 -07:00
kaetemi	708ccff3e1	Crash workaround	2014-09-03 08:18:21 +02:00
kaetemi	3f3319c40e	Throw exception instead of exit.	2014-09-03 07:23:39 +02:00
kaetemi	a43ff6e64e	Merge	2014-09-03 07:07:55 +02:00
kaetemi	9d8c2748fe	Die, don't exit	2014-09-03 07:06:43 +02:00
botanic	e879f1449a	Merge	2014-09-02 21:40:10 -07:00
botanic	8fe1648707	Fix #181	2014-09-02 21:39:35 -07:00
kaetemi	2abd6053d8	Force all user ids equal	2014-09-03 06:38:38 +02:00