meew0 345d0da72b Merge branch 'CKing-patch-3' into indev		2016-01-16 16:00:05 +01:00
..
Resolver	removed ES6 function calls	2016-01-15 15:11:21 +01:00
Client.js	Merge branch 'CKing-patch-3' into indev	2016-01-16 16:00:05 +01:00
ConnectionState.js	Use import/export since we are using babel, removed unused imports	2015-11-28 17:57:22 +01:00
InternalClient.js	Attempted merge of userUpdated and presence, along with before/after arguments	2016-01-13 23:35:37 -08:00