Merge branch 'master' into next

This commit is contained in:
Wyatt Johnson
2017-11-28 12:58:58 -07:00
committed by GitHub
79 changed files with 1238 additions and 746 deletions
@@ -16,7 +16,7 @@ export default {
reducer,
translations,
slots: {
streamTabs: [Tab],
streamTabsPrepend: [Tab],
streamTabPanes: [TabPane],
commentInfoBar: [Tag],
moderationActions: [ModActionButton],
@@ -57,7 +57,7 @@ export default {
}
const comment = findCommentInEmbedQuery(previous, variables.id);
if (previous.asset.comments) {
updated = update(previous, {
asset: {
@@ -101,7 +101,7 @@ export default {
updateQueries: {
CoralEmbedStream_Embed: (previous) => {
let updated = previous;
if (variables.name !== 'FEATURED') {
return;
}