Merge branch 'develop-olympus' into develop-ascraeus

Browse Source

* develop-olympus:
  [ticket/13527] Apply htmlspecialchars() to data from version server.
  [ticket/13527] Remove two unused variables.

Conflicts:
	phpBB/includes/acp/acp_update.php

...

This commit is contained in:

Andreas Fischer

2015-01-20 23:15:21 +01:00

parent 6e00529f36 d17904884e

commit d0e5c0a187

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available