David King 2212294ba3 Merge remote-tracking branch 'p/feature/template-events' into develop ...

* p/feature/template-events:
  [feature/template-events] Pass arguments in correct order.

Conflicts:
	phpBB/includes/style/style.php

2012-12-10 14:27:18 -05:00

..

extension_path_provider.php

…

path_provider_interface.php

…

path_provider.php

…

resource_locator.php

[ticket/11227] @return void -> @return null, per coding guidelines.

2012-11-30 23:03:06 -05:00

style.php

[feature/template-events] Pass arguments in correct order.

2012-12-10 14:02:57 -05:00