Merge branch 'master' into feature/text-tracks

This commit is contained in:
Hampton Maxwell 2018-06-05 19:42:04 -07:00 committed by GitHub
commit c3f9976b0b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -229,7 +229,7 @@ var styles = StyleSheet.create({
* [progressUpdateInterval](#progressupdateinterval) * [progressUpdateInterval](#progressupdateinterval)
* [rate](#rate) * [rate](#rate)
* [repeat](#repeat) * [repeat](#repeat)
* [resizeMode](#resize-mode) * [resizeMode](#resizemode)
* [selectedTextTrack](#selectedtexttrack) * [selectedTextTrack](#selectedtexttrack)
* [volume](#volume) * [volume](#volume)