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

2016-06-05 16:52:02 -04:00
parent 0a3fbdd128 dd6718c2cd
commit 08a9553ccc
7 changed files with 27 additions and 21 deletions
--- 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;