Merge branch '2013.10' into 2014.11
authorPhilipp Schüle <p.schuele@metaways.de>
Wed, 1 Apr 2015 15:59:44 +0000 (17:59 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Wed, 1 Apr 2015 15:59:44 +0000 (17:59 +0200)
commitf664238cbabd71bc5b7881b4948fb17efd19c0ff
treedaaea2a8f6fdf04ce47b82e6ff53239895ff56e9
parent0155cd1a27a1351f0df3db75fccaced605bfac97
parentc7f859ae3a62fb567785d7e60d4c1f95c357fa8c
Merge branch '2013.10' into 2014.11
tests/tine20/Tinebase/Frontend/Json/PersistentFilterTest.php
tine20/Sales/Controller/Contract.php
tine20/Tinebase/Model/Filter/Id.php
tine20/Tinebase/Record/Abstract.php