Merge branch 'master' into dev

2016-04-05 22:15:29 -07:00
parent 10f1e2d51b 54aa998b52
commit 0d50d29538
2 changed files with 2 additions and 1 deletions
--- a/boot.php
+++ b/boot.php
@@ -711,6 +711,7 @@ class App {
 	public static  $module;
 	public static  $pager;
 	public static  $strings;
+	public static  $stringsave;   // used in push_lang() and pop_lang()
 	public static  $hooks;
 	public static  $timezone;
 	public static  $interactive = true;