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)
commit5b8bbdaf19c9452c73c1979ad5e8b69c023c5f34
tree961c37ae471c47ffd2492a69898e0ce6597667a4
parent1242c66fd1b9f3e47fc81549a638b1c05a1b1770
parente1fc962bd1699404cf43076a564c46e3c83f9aa0
Merge branch '2014.11-develop' into 2015.07
tine20/Tinebase/Application.php
tine20/Tinebase/Config.php
tine20/Tinebase/Config/Abstract.php