Merge branch '3.0' of github.com:calzoneman/sync into 3.0
commitc2bfbf9b383b8b6f2913be884e189b30b6e83ea8
authorECHibiki <ECVerniy@gmail.com>
Sun, 14 Jul 2019 16:25:03 +0000 (14 16:25 +0000)
committerECHibiki <ECVerniy@gmail.com>
Sun, 14 Jul 2019 16:25:03 +0000 (14 16:25 +0000)
treefbe39ff16860ff8dbb5b2ca66052f2ca2f22dc34
parent65a536d843bb2c9d3433fa6709eddad41d4d3c5a
parent77b7af7fd961257f398fc4efb8d11dc49c459f9a
Merge branch '3.0' of github.com:calzoneman/sync into 3.0
19 files changed:
.travis.yml
docs/custom-media.md
integration_test/channel/kickban.js
integration_test/db/aliases.js
package.json
player/dailymotion.coffee
player/embed.coffee
src/channel/opts.js
src/channel/poll.js
src/channel/voteskip.js
src/ffmpeg.js
src/get-info.js
templates/acp.pug
test/channel/voteskip.js
www/js/acp.js
www/js/callbacks.js
www/js/data.js
www/js/ui.js
www/js/util.js