Merge branch '2013.10'
authorPhilipp Schüle <p.schuele@metaways.de>
Tue, 22 Apr 2014 15:43:52 +0000 (17:43 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Tue, 22 Apr 2014 15:43:52 +0000 (17:43 +0200)
commit44f1019c9a429e18cc3eccb7a2fb0141d6751fac
tree321bd19330688c9704265d10d8d40ff86a68da3e
parent6798eeb2ec9517da444635672b02650d2dd36d4c
parent2b422a7c0b6d7fd756b1df48d8b73728e0473e90
Merge branch '2013.10'

Conflicts:
tine20/HumanResources/translations/de.po
tine20/HumanResources/translations/template.pot
13 files changed:
tests/tine20/Calendar/Controller/EventNotificationsTests.php
tests/tine20/Calendar/Export/ICalTest.php
tests/tine20/Calendar/Frontend/WebDAV/EventTest.php
tests/tine20/Calendar/JsonTests.php
tests/tine20/HumanResources/JsonTests.php
tine20/Admin/Setup/DemoData.php
tine20/Crm/Model/Lead.php
tine20/Felamimail/translations/de.po
tine20/Felamimail/translations/template.pot
tine20/HumanResources/Frontend/Json.php
tine20/HumanResources/translations/de.po
tine20/HumanResources/translations/template.pot
tine20/Tinebase/js/widgets/relation/GenericPickerGridPanel.js