Schuyler Cebulskie 02c23a8b53 Merge branch 'master' into indev-prism

2017-02-01 15:32:18 -05:00

..

actions

Add support to edit emojis (#1142)

2017-01-30 22:47:05 -05:00

rest

Fix CodeBlock Splitting (#1160)

2017-02-01 15:31:57 -05:00

voice

Properly check whether an Opus engine exists (#1150)

2017-01-30 16:38:47 -05:00

websocket

Fix #1095

2017-01-30 22:54:37 -05:00

Client.js

Merge branch 'master' into indev-prism

2017-02-01 15:29:45 -05:00

ClientDataManager.js

Add support to edit emojis (#1142)

2017-01-30 22:47:05 -05:00

ClientDataResolver.js

Clean up colour resolver

2017-01-13 22:55:10 -05:00

ClientManager.js

Handle 4011 ws event code (#1083)

2017-01-11 22:59:09 +00:00

WebhookClient.js

Make docs catches use console.error

2016-10-26 21:37:19 -04:00