Commit Graph
3 Commits
Author SHA1 Message Date
Wyatt Johnson 9403280c56 Merge branch 'master' into edit-changes 2017-05-12 15:44:19 -06:00
Chi Vinh Le 7857cadef5 Merge branch 'master' into query-mutation-api
Conflicts:
	client/coral-embed-stream/src/components/Comment.js
	client/coral-embed-stream/src/containers/Embed.js
	client/coral-embed-stream/src/containers/Stream.js
	client/coral-embed-stream/src/index.js
	client/coral-framework/graphql/fragments/commentView.graphql
	client/coral-framework/graphql/mutations/index.js
	client/coral-framework/hocs/index.js
	client/coral-framework/hocs/withFragments.js
2017-05-12 19:50:36 +07:00
Chi Vinh Le 028e13761f Complete graphql code refactor in framework 2017-05-09 03:05:19 +07:00