aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarc Alexander <admin@m-a-styles.de>2016-01-08 17:57:05 +0100
committerMarc Alexander <admin@m-a-styles.de>2016-01-08 17:57:05 +0100
commitc6c7730e040ee085cdf921bf54f562d18e68f880 (patch)
tree23a3236a966bd57f358582e24cffb7fefdd09146
parent0028ed3e956f2d8e418e0cd26be34cff133ef672 (diff)
parent45d64c4486efac6c5c970258ee116b867928d9d7 (diff)
downloadforums-c6c7730e040ee085cdf921bf54f562d18e68f880.tar
forums-c6c7730e040ee085cdf921bf54f562d18e68f880.tar.gz
forums-c6c7730e040ee085cdf921bf54f562d18e68f880.tar.bz2
forums-c6c7730e040ee085cdf921bf54f562d18e68f880.tar.xz
forums-c6c7730e040ee085cdf921bf54f562d18e68f880.zip
Merge branch '3.1.x'
-rw-r--r--phpBB/includes/ucp/ucp_prefs.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/includes/ucp/ucp_prefs.php b/phpBB/includes/ucp/ucp_prefs.php
index bf4b5ad2f2..b8e34af931 100644
--- a/phpBB/includes/ucp/ucp_prefs.php
+++ b/phpBB/includes/ucp/ucp_prefs.php
@@ -389,7 +389,7 @@ class ucp_prefs
* @var string s_limit_post_days Sort limit post by days select box
* @var string s_sort_post_key Sort post key select box
* @var string s_sort_post_dir Sort post dir select box
- * @since 3.1.7-RC1
+ * @since 3.1.8-RC1
*/
$vars = array(
'submit',