Merge remote-tracking branch 'upstream/develop-ascraeus' into ticket/12594

Browse Source

Conflicts:
	phpBB/docs/hook_system.html

...

This commit is contained in:

Yuriy Rusko

2014-05-27 21:55:40 +02:00

parent 27f787e5e4 0acaa77229

commit 1d61bcedfd

39 changed files with 507 additions and 2465 deletions

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

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

1099

phpBB/includes/acp/acp_language.php

File diff suppressed because it is too large Load Diff