Merge branch 'develop-olympus' into develop-ascraeus

Browse Source

* develop-olympus:
  [ticket/13554] Show feature release upgrades in blue rather than red.

Conflicts:
	phpBB/adm/style/acp_update.html

...

This commit is contained in:

Andreas Fischer 2015-01-29 23:21:59 +01:00

parent 5b96d30540 cc210b1842

commit 05d8264de6

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

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

Diff Content Not Available