Merge remote-tracking branch 'upstream/develop' into camelCaps

2018-08-21 20:57:58 +02:00
parent d68f176e7e db3c17668e
commit 6b6daf178f
216 changed files with 1840 additions and 818 deletions
--- a/htdocs/core/modules/usergroup/modules_usergroup.class.php
+++ b/htdocs/core/modules/usergroup/modules_usergroup.class.php
@@ -38,7 +38,10 @@
 */
 abstract class ModelePDFUserGroup extends CommonDocGenerator
 {
-	var $error='';
+	/**
+	 * @var string Error code (or message)
+	 */
+	public $error='';


 	/**