Merge branch 'pu/inventory'
authorPhilipp Schüle <p.schuele@metaways.de>
Thu, 21 Feb 2013 14:41:25 +0000 (15:41 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Thu, 21 Feb 2013 14:41:25 +0000 (15:41 +0100)
Conflicts:
tine20/Inventory/Setup/Update/Release6.php
tine20/Inventory/Setup/setup.xml

1  2 
tine20/Inventory/Setup/setup.xml
tine20/Tinebase/Import/Abstract.php

@@@ -2,13 -2,13 +2,13 @@@
  <application>
      <name>Inventory</name>
      <!-- gettext('Inventory') -->   
-     <version>7.4</version>
 -    <version>6.6</version>
++    <version>7.5</version>
      <order>60</order>
      <status>enabled</status>
      <tables>
          <table>
              <name>inventory_item</name>
--            <version>5</version>
++            <version>6</version>
              <declaration>
                  <field>
                      <name>id</name>
Simple merge