Merge branch 'dev' into sabre32

1 files changed, 2 insertions, 1 deletions

diff --git a/boot.php b/boot.php
index 16c5fed11..76312ed4e 100755
--- a/boot.php
+++ b/boot.php
@@ -783,6 +783,7 @@ class App {
 	public static  $content;
 	public static  $data = array();
 	public static  $error = false;
+	public static  $emojitab = false;
 	public static  $cmd;
 	public static  $argv;
 	public static  $argc;
@@ -866,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');