aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/diff
diff options
context:
space:
mode:
authorAndreas Fischer <bantu@phpbb.com>2011-06-22 02:32:27 +0200
committerAndreas Fischer <bantu@phpbb.com>2011-06-22 02:32:27 +0200
commit29df4b5c60aed818949865b31ac696978e7f8965 (patch)
tree01cfc959b96cb9cdfdea0aa90e8ad2e16db5d74a /phpBB/includes/diff
parentfd7e29131ecf437823f625e60e8bbcc0ddb0de40 (diff)
parent1ffa5865832c918e9b96dcf6ee58cc44603dcb65 (diff)
downloadforums-29df4b5c60aed818949865b31ac696978e7f8965.tar
forums-29df4b5c60aed818949865b31ac696978e7f8965.tar.gz
forums-29df4b5c60aed818949865b31ac696978e7f8965.tar.bz2
forums-29df4b5c60aed818949865b31ac696978e7f8965.tar.xz
forums-29df4b5c60aed818949865b31ac696978e7f8965.zip
Merge branch 'prep-release-3.0.9' into develop-olympus
* prep-release-3.0.9: [ticket/10228] Correct "trigger" to "triggered" in acp registration settings
Diffstat (limited to 'phpBB/includes/diff')
0 files changed, 0 insertions, 0 deletions