1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-05-06 23:55:26 +02:00
Andreas Fischer 21bd0ca31a Merge branch 'develop-olympus' into develop
With 5efdbfa5e4e3c00c08167cdfff912ee4937f4fd2 reverted.

* develop-olympus:
  [task/php54] Disable E_STRICT in Olympus when running on PHP 5.4.
  [task/php54] Refactor error_reporting call slightly.
2012-03-22 10:51:03 +01:00
..