Merge branch '2014.11-develop' into 2015.07
authorPhilipp Schüle <p.schuele@metaways.de>
Wed, 5 Aug 2015 17:55:05 +0000 (19:55 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Wed, 5 Aug 2015 17:55:05 +0000 (19:55 +0200)
Conflicts:
tine20/Tinebase/Core.php

Change-Id: I63ac802ba46cd9cfc04c8b50f28b24c729cc9cfe

1  2 
tine20/Calendar/Setup/Update/Release8.php
tine20/Calendar/js/MainScreenCenterPanel.js
tine20/Tinebase/Core.php

@@@ -190,15 -183,8 +190,15 @@@ class Tinebase_Cor
       * 
       * @var int
       */
-     protected static $logLevel;
+     protected static $logLevel = null;
 -    
 +
 +    /**
 +     * Server classes provided by applications
 +     *
 +     * @var array
 +     */
 +    protected static $_serverPlugins = array();
 +
      /******************************* DISPATCH *********************************/
      
      /**