commit-link" data-hovercard-type="commit" data-hovercard-url="https://github.com/adaptlearning/adapt-contrib-media/commit/5c54cc1b69da2aef1e2188787c51107f43031a7f/hovercard" href="https://github.com/adaptlearning/adapt-contrib-media/commit/5c54cc1b69da2aef1e2188787c51107f43031a7f">5c54cc1 Merge: affdc24 1132f48 Author: Daryl Hedley <darylhedley@hotmail.com> Date: Wed Dec 11 16:44:06 2013 +0000 Merge branch 'develop' of https://github.com/adaptlearning/adapt-contrib-media into feature/8830 * 'develop' of https://github.com/adaptlearning/adapt-contrib-media: Updated media component with fixes to issue#1 Conflicts: js/adapt-contrib-media.js commit affdc24 Author: Chris Steele <chris.steele@kineo.com> Date: Wed Dec 11 15:23:20 2013 +0000 issues 1 commit 201f034 Author: Chris Steele <chris.steele@kineo.com> Date: Wed Dec 11 14:08:46 2013 +0000 clean up commit 4899190 Author: Chris Steele <chris.steele@kineo.com> Date: Wed Dec 11 13:46:52 2013 +0000 various updates and restructure commit 831cbff Author: Chris Steele <chris.steele@kineo.com> Date: Wed Dec 11 11:49:36 2013 +0000 test

Commits

Commits on Dec 11, 2013

Updated to fix issue#1