-
- Downloads
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop Conflicts: ChangeLog
Showing
- ChangeLog 18 additions, 12 deletionsChangeLog
- htdocs/adherents/admin/adherent_extrafields.php 1 addition, 1 deletionhtdocs/adherents/admin/adherent_extrafields.php
- htdocs/adherents/admin/adherent_type_extrafields.php 1 addition, 1 deletionhtdocs/adherents/admin/adherent_type_extrafields.php
- htdocs/adherents/class/adherent.class.php 1 addition, 1 deletionhtdocs/adherents/class/adherent.class.php
- htdocs/adherents/fiche.php 1 addition, 1 deletionhtdocs/adherents/fiche.php
- htdocs/admin/agenda_extrafields.php 1 addition, 1 deletionhtdocs/admin/agenda_extrafields.php
- htdocs/admin/confexped.php 1 addition, 1 deletionhtdocs/admin/confexped.php
- htdocs/admin/expedition.php 6 additions, 6 deletionshtdocs/admin/expedition.php
- htdocs/admin/livraison.php 7 additions, 7 deletionshtdocs/admin/livraison.php
- htdocs/admin/order_extrafields.php 1 addition, 1 deletionhtdocs/admin/order_extrafields.php
- htdocs/admin/orderdet_extrafields.php 1 addition, 1 deletionhtdocs/admin/orderdet_extrafields.php
- htdocs/admin/supplierinvoice_extrafields.php 1 addition, 1 deletionhtdocs/admin/supplierinvoice_extrafields.php
- htdocs/admin/supplierorder_extrafields.php 1 addition, 1 deletionhtdocs/admin/supplierorder_extrafields.php
- htdocs/categories/categorie.php 3 additions, 3 deletionshtdocs/categories/categorie.php
- htdocs/comm/action/contact.php 6 additions, 5 deletionshtdocs/comm/action/contact.php
- htdocs/comm/action/document.php 4 additions, 4 deletionshtdocs/comm/action/document.php
- htdocs/comm/action/fiche.php 18 additions, 5 deletionshtdocs/comm/action/fiche.php
- htdocs/comm/action/index.php 3 additions, 3 deletionshtdocs/comm/action/index.php
- htdocs/comm/action/info.php 1 addition, 1 deletionhtdocs/comm/action/info.php
- htdocs/comm/admin/propal_extrafields.php 1 addition, 1 deletionhtdocs/comm/admin/propal_extrafields.php
Loading
Please register or sign in to comment