Merge branch '2014.11-develop' into 2015.07
authorPhilipp Schüle <p.schuele@metaways.de>
Wed, 14 Oct 2015 10:27:46 +0000 (12:27 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Wed, 14 Oct 2015 10:27:46 +0000 (12:27 +0200)
1  2 
tine20/Tinebase/Application.php
tine20/Tinebase/Config.php
tine20/Tinebase/Config/Abstract.php

Simple merge
Simple merge
Simple merge