Merge branch 'develop' of https://github.com/getgrav/grav into 2.0

getgrav · May 18, 2017 · 4b14a0d · 4b14a0d
2 parents bf687e6 + f3cecd8
commit 4b14a0d
Showing 1 changed file with 10 additions and 2 deletions.
diff --git a/system/src/Grav/Common/Grav.php b/system/src/Grav/Common/Grav.php
@@ -18,8 +18,14 @@
 
 class Grav extends Container
 {
+    /**
+     * @var string Processed output for the page.
+     */
+    public $output;
 
-    /** @var static The singleton instance */
+    /**
+     * @var static The singleton instance
+     */
     protected static $instance;
 
     /**
@@ -64,7 +70,9 @@ class Grav extends Container
         'renderProcessor'         => 'Grav\Common\Processors\RenderProcessor',
     ];
 
-    /** @var array All processors that are processed in $this->process() */
+    /**
+     * @var array All processors that are processed in $this->process()
+     */
     protected $processors = [
         'siteSetupProcessor',
         'configurationProcessor',