phpbb/phpBB/adm
Oleg Pudeyev 83d71ecb88 Merge remote-tracking branch 'VSEphpbb/ticket/10390' into develop
* VSEphpbb/ticket/10390:
  [ticket/10390] Revert back to escaped script tags inside document.write
  [ticket/10390] Fix wording: fallback should be fall back
  [ticket/10390] Serve jQuery from Google CDN Yes/No button in ACP
  [ticket/10390] Use simpler HTML5 compliant js for the jQuery fallback
  [ticket/10390] Drop http protocol for Microsoft's CDN option
  [ticket/10390] Reword the language for jQuery host/server options
  [ticket/10390] Fix a type-o - captialize AJAX
  [ticket/10390] Improve the jQuery CDN url generation function
  [ticket/10390] Move jQuery version definition
  [ticket/10390] Allow option for jQuery to be hosted by a remote CDN

Conflicts:
	phpBB/install/database_update.php
2011-10-20 20:46:48 -04:00
..
images removed executable props [Bug #6464] 2008-06-04 15:37:06 +00:00
style Merge remote-tracking branch 'VSEphpbb/ticket/10390' into develop 2011-10-20 20:46:48 -04:00
index.php [feature/remove-db-styles] Removed database storage of style components. 2011-09-20 21:06:51 +01:00
swatch.php [ticket/9556] Drop php closing tags, add trailing newline 2010-11-11 19:10:55 +01:00