Merge branch 'master' into events/33c3

1 files changed, 5 insertions, 0 deletions

diff --git a/model/GenericConference.php b/model/GenericConference.php
index 5f134fc..63faf8f 100644
--- a/model/GenericConference.php
+++ b/model/GenericConference.php
@@ -2,6 +2,11 @@
 
 class GenericConference extends Conference
 {
+	public function __construct()
+	{
+		$this->config = null;
+	}
+
 	public function hasBegun() {
 		return true;
 	}