Nathan Guse bd8951cfbe Merge branch 'develop-olympus' into develop ... * develop-olympus: [ticket/12093] Check that document.selection is supported. Conflicts: phpBB/adm/style/editor.js phpBB/assets/javascript/editor.js phpBB/styles/prosilver/template/editor.js		2014-02-19 09:23:02 -06:00
..
core.js	[ticket/11241] Add dropdown control button.	2013-12-06 00:44:48 -08:00
editor.js	Merge branch 'develop-olympus' into develop	2014-02-19 09:23:02 -06:00
jquery.js	[ticket/10155] Update jQuery to 1.8.3	2013-03-14 10:45:17 -07:00
plupload.js	[ticket/12208] Remove file from upload queue if deleted before being uploaded.	2014-02-17 15:11:24 -08:00