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