]> _ Git - cubeextranet.git/commit
Merge master branch to html5video and solve conflicts. WIP #897 @1
authorstephen@cubedesigners.com <stephen@cubedesigners.com@f5622870-0f3c-0410-866d-9cb505b7a8ef>
Thu, 29 Jun 2017 17:27:21 +0000 (17:27 +0000)
committerstephen@cubedesigners.com <stephen@cubedesigners.com@f5622870-0f3c-0410-866d-9cb505b7a8ef>
Thu, 29 Jun 2017 17:27:21 +0000 (17:27 +0000)
commitbaaaf20e0d162a5e0fd782833358f80e1668739a
tree30cc8ecbcdd26d4ae7a640d8ebe688276c06c9cc
parente6290daa130ffebb2a5b6e194967d05c104c68bf
Merge master branch to html5video and solve conflicts. WIP #897 @1
inc/ws/Util/html5/html5video/class.ws.html5.compiler.php
inc/ws/Util/html5/html5video/class.ws.html5.links.php