Merge branch 'develop-olympus' into develop-ascraeus

Browse Source

* develop-olympus:
  [ticket/10985] Add fix to properly inherit style during update process

Conflicts:
	phpBB/includes/bbcode.php

...

This commit is contained in:

Nils Adermann 2015-01-19 22:29:38 +01:00

parent ff39ffacf6 ebbe6a7791

commit e4a041fedb

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