Merge branch 'develop' into feature/try-out-sphinx

# Conflicts: # docs
lookit · Nov 7, 2020 · a65b970 · a65b970
2 parents aad9270 + e1758d6
commit a65b970
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/app/components/exp-lookit-preferential-looking/component.js b/app/components/exp-lookit-preferential-looking/component.js
@@ -12,7 +12,7 @@ let {
 
 /**
  * @module exp-player
- * @submodule frames
+ * @submodule frames-deprecated
  */
 
 /**
@@ -130,6 +130,7 @@ let {
 * @uses Full-screen
 * @uses Video-record
 * @uses Expand-assets
+ * @deprecated
 */
 
 export default ExpFrameBaseComponent.extend(FullScreen, VideoRecord, ExpandAssets, {