Merge branch '2013.10' into 2014.09
authorPhilipp Schüle <p.schuele@metaways.de>
Mon, 27 Oct 2014 12:47:02 +0000 (13:47 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Mon, 27 Oct 2014 12:47:02 +0000 (13:47 +0100)
Conflicts:
tine20/Sales/css/Sales.css

Change-Id: Ib918aed81b96952178b78126b066689665b9892c

1  2 
tests/tine20/Calendar/Controller/EventTests.php
tine20/Calendar/js/Model.js
tine20/Crm/Controller/Lead.php
tine20/Sales/css/Sales.css

Simple merge
Simple merge
      background-image:url(../../images/oxygen/32x32/apps/kcalc.png) !important;
  }
  
- .SalesCostCenter {
-     background-image:url("../../images/../Sales/images/16x16/costcenter.png") !important;
- }
 +.SalesDivision {
 +    background-image:url("../../images/oxygen/16x16/actions/view-process-users.png") !important;
++}
++
+ .SalesCostCenter {
+     background-image:url("../../images/oxygen/16x16/apps/preferences-web-browser-cache.png") !important;
  }