Steve Heffernan 781b4e59f5 Merge branch 'fix-hidden-flash-methods-squashed' ... Conflicts: src/js/media/flash.js		2014-07-28 17:07:53 -07:00
..
css	Updated the chapters menu styles to center the menu to the button.	2014-06-13 11:33:23 -07:00
js	Merge branch 'fix-hidden-flash-methods-squashed'	2014-07-28 17:07:53 -07:00