search

appsembler / xblock-video

Universal Video XBlock with pluggable backend for many video hosting providers
GNU General Public License v3.0
18 stars 50 forks source link

Cumulative fixes #19

Closed wowkalucky closed 6 years ago

wowkalucky commented 6 years ago

Fixed

OmarIthawi commented 6 years ago

Thank you for your contribution @wowkalucky! As you've probably noticed, there's a couple of conflicts in this PR. Could you please fix them?

wowkalucky commented 6 years ago

@OmarIthawi done. But I can't see the result. It seems I have no appropriate permissions...

OmarIthawi commented 6 years ago

@wowkalucky As far as I know this is GitHub bug! Please use the command-line merge instead of GitHub's.

wowkalucky commented 6 years ago

Fixed in next PR.