Merge branch 'master' into next

This commit is contained in:
Wyatt Johnson authored and GitHub committed 2017-11-28 12:58:58 -07:00
commit fc824b1fbe
79 files changed
+1238 -746

No files matched your search

@@ -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;
}