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

1 files changed, 1 insertions, 0 deletions

diff --git a/boot.php b/boot.php
index 53d17728f..f7df2d74b 100755
--- a/boot.php
+++ b/boot.php
@@ -784,6 +784,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;