Andreas Fischer d3a1b670bd Merge branch 'develop-olympus' into develop ...

* develop-olympus:
  [ticket/7138] Allow simple header and footer for trigger_error() messages

Conflicts:
	phpBB/styles/prosilver/template/message_body.html

2011-11-13 20:28:29 +01:00

..

prosilver

Merge branch 'develop-olympus' into develop

2011-11-13 20:28:29 +01:00

subsilver2

[ticket/10390] Allow option for jQuery to be hosted by a remote CDN

2011-09-26 11:15:22 -07:00