Merge remote-tracking branch 'upstream/dev' into wiki

1 files changed, 1 insertions, 1 deletions

diff --git a/boot.php b/boot.php
index b691ed2ed..53d17728f 100755
--- a/boot.php
+++ b/boot.php
@@ -867,7 +867,7 @@ class App {
 	/**
 	 * App constructor.
 	 */
-	function init() {
+	public static function init() {
 		// we'll reset this after we read our config file
 		date_default_timezone_set('UTC');