Merge branch 'pu/cal2013'
authorPhilipp Schüle <p.schuele@metaways.de>
Wed, 30 Jan 2013 11:24:17 +0000 (12:24 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Wed, 30 Jan 2013 11:24:17 +0000 (12:24 +0100)
Conflicts:
tine20/Calendar/js/MainScreenCenterPanel.js

18 files changed:
1  2 
tests/tine20/Addressbook/JsonTest.php
tests/tine20/Calendar/Controller/EventTests.php
tests/tine20/Calendar/Controller/MSEventFacadeTest.php
tests/tine20/Crm/JsonTest.php
tests/tine20/Tinebase/CustomFieldTest.php
tine20/Calendar/Controller/Event.php
tine20/Calendar/Frontend/Json.php
tine20/Calendar/Model/Event.php
tine20/Calendar/Model/Rrule.php
tine20/Calendar/js/MainScreenCenterPanel.js
tine20/Calendar/js/Model.js
tine20/Felamimail/Controller/Account.php
tine20/Tinebase/Backend/Sql/Abstract.php
tine20/Tinebase/Controller/Record/Abstract.php
tine20/Tinebase/Frontend/Json/Abstract.php
tine20/Tinebase/Record/Abstract.php
tine20/Tinebase/Record/RecordSet.php
tine20/Tinebase/Timemachine/ModificationLog.php

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge