Merge branch 'release/2.1.0' into develop
authorChocobozzz <me@florianbigard.com>
Wed, 29 Jan 2020 13:23:20 +0000 (14:23 +0100)
committerChocobozzz <me@florianbigard.com>
Wed, 29 Jan 2020 13:23:20 +0000 (14:23 +0100)
commitcf59a2a0c367683ba35758419499bf6087c192ec
tree98435929a97295aed5928a70c49e143991b28b0a
parentcf57794e9b104401884998c38b2dfa7cfe9638b0
parent8ff604c7e300eec5c0b29644292d6399521a1930
Merge branch 'release/2.1.0' into develop
client/src/assets/player/videojs-components/resolution-menu-button.ts