Kim Gardner 1df48e27f1 Fix merge conflicts

2017-10-19 11:45:59 +01:00

..

client

relax language

2017-10-03 21:19:19 +07:00

e2e

Merge branch 'e2e-browserstack' of ssh://github.com/coralproject/talk into e2e-browserstack

2017-10-18 23:18:09 +07:00

helpers

Replaced node_redis with ioredis

2017-08-29 17:52:29 -06:00

server

fixes to the toObject, added test

2017-10-18 16:07:20 -06:00

.eslintrc.json

Use eslint-config-talk preset

2017-09-26 19:35:24 +07:00

mocha.opts

removed more outdated test code

2017-08-19 10:34:52 -06:00