aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/ucp/ucp_profile.php
diff options
context:
space:
mode:
authorMarc Alexander <admin@m-a-styles.de>2017-02-11 15:21:00 +0100
committerMarc Alexander <admin@m-a-styles.de>2017-02-11 21:48:20 +0100
commitf27cdad73e7a4af913414522d85855136bf50b31 (patch)
tree33ce0eb4d82bdf011b6235b60daea812c3902982 /phpBB/includes/ucp/ucp_profile.php
parent59ad9401d9db8c6b6612f01f7b295f12c4cdccf7 (diff)
parent45199adebdfc00f436a719de1c5772429367b756 (diff)
downloadforums-f27cdad73e7a4af913414522d85855136bf50b31.tar
forums-f27cdad73e7a4af913414522d85855136bf50b31.tar.gz
forums-f27cdad73e7a4af913414522d85855136bf50b31.tar.bz2
forums-f27cdad73e7a4af913414522d85855136bf50b31.tar.xz
forums-f27cdad73e7a4af913414522d85855136bf50b31.zip
Merge branch '3.1.x' into 3.2.x
Diffstat (limited to 'phpBB/includes/ucp/ucp_profile.php')
-rw-r--r--phpBB/includes/ucp/ucp_profile.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/includes/ucp/ucp_profile.php b/phpBB/includes/ucp/ucp_profile.php
index 3356195dd6..b7f8501fe4 100644
--- a/phpBB/includes/ucp/ucp_profile.php
+++ b/phpBB/includes/ucp/ucp_profile.php
@@ -508,7 +508,7 @@ class ucp_profile
* @var bool submit Whether or not the form has been sumitted
* @var bool preview Whether or not the signature is being previewed
* @since 3.1.10-RC1
- * @change 3.2.0-RC2 Removed message parser
+ * @changed 3.2.0-RC2 Removed message parser
*/
$vars = array(
'enable_bbcode',