Merge branch 'develop-olympus' into develop

* develop-olympus: [ticket/11227] @return void -> @return null in develop-olympus.
2025-07-30 21:40:43 +02:00 · 2012-11-29 23:17:58 +01:00
parent aa9aa28fa2 b2a252d274
commit 5d78346453
14 changed files with 18 additions and 18 deletions
--- a/phpBB/includes/questionnaire/questionnaire.php
+++ b/phpBB/includes/questionnaire/questionnaire.php
@@ -70,7 +70,7 @@ class phpbb_questionnaire_data_collector
 	/**
 	* Collect info into the data property.
 	*
-	* @return	void
+	* @return	null
 	*/
 	function collect()
 	{