Merge branch 'pu/2013.10-emaillinks'
authorPhilipp Schüle <p.schuele@metaways.de>
Wed, 10 Sep 2014 17:22:35 +0000 (19:22 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Wed, 10 Sep 2014 17:22:35 +0000 (19:22 +0200)
Conflicts:
tests/tine20/Tinebase/AllTests.php

Change-Id: I575126534bb580135cc70a062a1de760084031cb

1  2 
tests/tine20/Tinebase/AllTests.php

@@@ -63,8 -63,8 +63,9 @@@ class Tinebase_AllTest
          $suite->addTestSuite('Tinebase_TagsTest');
          $suite->addTestSuite('Tinebase_Log_AllTests');
          $suite->addTestSuite('Tinebase_Redis_QueueTest');
 -        $suite->addTestSuite('Tinebase_TempFileTest');
 +        $suite->addTestSuite('Tinebase_TempFileTest');  
-         $suite->addTestSuite('Tinebase_Pluggable_ConcreteTest');             
++        $suite->addTestSuite('Tinebase_Pluggable_ConcreteTest');
+         $suite->addTestSuite('Tinebase_MailTest');
          
          $suite->addTest(Tinebase_User_AllTests::suite());
          $suite->addTest(Tinebase_Group_AllTests::suite());