[ticket/12413] Revert e65a6dd8f45d0ce4c8700fb68c19ac6268162aa0 in olympus

Browse Source

Merge branch 'ticket/12413' into ticket/12413-ascraeus

* ticket/12413:
  [ticket/12413] Revert e65a6dd8f45d0ce4c8700fb68c19ac6268162aa0

Conflicts:
	phpBB/feed.php

The reverting is not done for develop-ascraeus and above.
We want to fix it properly there instead.

PHPBB3-12413

...

This commit is contained in:

Joas Schilling 2014-04-22 19:01:25 +02:00

parent ed07f1b85e f9cdec90fc

commit 3425eeaf7d

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