Merge branch 'develop-olympus' into develop

Browse Source

By Andreas Fischer
via Andreas Fischer (1) and Nils Adermann (1)
* develop-olympus:
  [ticket/10550] Sort not installed styles list in the styles section of the ACP.

Conflicts:
	phpBB/includes/acp/acp_styles.php

...

This commit is contained in:

Nils Adermann

2012-05-31 15:46:23 +02:00

parent bafaf3700c 7eaedcc8de

commit b16f3834a3

1 changed files with 1 additions and 1 deletions

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