Commit Graph

2 Commits

Author SHA1 Message Date
Nanobyte
797e0b4641 Fix test cases 2021-01-06 01:43:28 +01:00
Ajay Ramachandran
2cd78d5d2f Merge branch 'master' of https://github.com/ajayyy/SponsorBlockServer into Dainius14/master
# Conflicts:
#	src/routes/shadowBanUser.js
#	src/routes/voteOnSponsorTime.ts
#	test/cases/getSkipSegments.js
#	test/cases/voteOnSponsorTime.js
2020-12-07 17:35:15 -05:00