frankdelange 41d5a19252 Merge branch 'master' into pdfreader ... - fix merge conflicts master -> pdfreader		2018-01-18 01:26:39 +01:00
..
lib	files_reader: v 0.7.0 - updated epub.js to 0.2.13, experimental compatibility-mode with Internet Explorer	2016-02-14 23:34:06 +01:00
plugin.js	files_reader: remove 'allow-popups' from iframe permissions, was there temporarily for testing purposes	2017-03-29 16:37:26 +02:00
ready.js	Merge branch 'master' into pdfreader	2018-01-18 01:26:39 +01:00