Skip to content

Commit

Permalink
Merge branch 'feature_subtitle' into 'xgplayer-2'
Browse files Browse the repository at this point in the history
Feature subtitle

See merge request toutiao-fe-arch/xgplayer!32
  • Loading branch information
zhangxin92 committed Mar 2, 2021
2 parents 33ccd9f + 392fe75 commit 75721a6
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -79,4 +79,5 @@ typings/

.DS_Store

.history
.history
examples
1 change: 0 additions & 1 deletion examples
Submodule examples deleted from 231af2
2 changes: 1 addition & 1 deletion packages/xgplayer/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
"downloadjs": "1.4.7",
"draggabilly": "^2.2.0",
"event-emitter": "^0.3.5",
"xgplayer-subtitles": "^1.0.5"
"xgplayer-subtitles": "^1.0.7"
},
"browserslist": [
"> 5%",
Expand Down

0 comments on commit 75721a6

Please sign in to comment.