Chi Vinh Le 48595a1bbf Merge branch 'master' into user-sort ...

Conflicts:
	client/coral-admin/src/reducers/moderation.js
	client/coral-embed-stream/src/actions/stream.js
	client/coral-embed-stream/src/components/Stream.js
	client/coral-framework/components/Slot.js
	plugin-api/beta/client/utils/index.js
	test/server/routes/api/account/index.js

2017-08-25 21:55:00 +07:00

..

client

Merge branch 'master' into user-sort

2017-08-25 21:55:00 +07:00

server

added docs for Comments.Sort, some changes to interface

2017-08-22 11:47:52 -06:00