adaptlearning/adapt-contrib-media — pull request #4 by darylhedley (2013-12-11 17:38:37+00:00)
Title: Updated to fix issue#1

Squashed commit of the following:

commit 5c54cc1b69da2aef1e2188787c51107f43031a7f
Merge: affdc24 1132f48
Author: Daryl Hedley
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 affdc24f7d688182b049574679cae19bbd80ce30
Author: Chris Steele
Date: Wed Dec 11 15:23:20 2013 +0000

issues 1

commit 201f034465aecb994d6bebefa8194c679eec4657
Author: Chris Steele
Date: Wed Dec 11 14:08:46 2013 +0000

clean up

commit 4899190b2deee7cda4609bb53716917d5b5684b8
Author: Chris Steele
Date: Wed Dec 11 13:46:52 2013 +0000

various updates and restructure

commit 831cbffe3f3db585a4e7b46d9bd401086ade314c
Author: Chris Steele
Date: Wed Dec 11 11:49:36 2013 +0000

test