Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

merge upstream 6.4.x #11

Draft
wants to merge 254 commits into
base: f/videolounge
Choose a base branch
from
Draft

merge upstream 6.4.x #11

wants to merge 254 commits into from

Conversation

ppettit
Copy link

@ppettit ppettit commented Oct 1, 2020

No description provided.

ferserc1 and others added 30 commits October 14, 2019 08:29
…on-on-screen-at-end-Issue408-dev

Play/pause button on screen now shows when video reaches end
# Conflicts:
#	CHANGELOG
# Conflicts:
#	CHANGELOG
ferserc1 and others added 30 commits April 1, 2020 12:41
Bumps [jquery](https://github.com/jquery/jquery) from 3.4.1 to 3.5.0.
- [Release notes](https://github.com/jquery/jquery/releases)
- [Commits](jquery/jquery@3.4.1...3.5.0)

Signed-off-by: dependabot-preview[bot] <[email protected]>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
# Conflicts:
#	CHANGELOG
#	package.json
I assume this is wrong but this seems to make things work for now
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants