Merge branch 'wb' into staging

This commit is contained in:
yflory
2017-10-13 16:58:59 +02:00
4 changed files with 85 additions and 21 deletions

View File

@@ -629,6 +629,7 @@ define([
}
}),
h('div#cp-app-whiteboard-pickers'),
h('div#cp-app-whiteboard-media-hidden')
];
};