Merge origin/master

Browse source

Conflicts:
	view/modeYoutube.php

...

This commit is contained in:

daniel 2018-04-25 15:40:34 -03:00

parent 335379e150 d588645f4b

commit b50cd47538

10 changed files with 16 additions and 22 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

8

plugin/Live/view/swfobject.js

View file

File diff suppressed because one or more lines are too long