Merge remote-tracking branch 'origin/3.5' into develop
Conflicts: htdocs/.gitignore htdocs/contact/fiche.php
No related branches found
No related tags found
Showing
- ChangeLog 9 additions, 2 deletionsChangeLog
- build/doxygen/doxygen_footer.html 2 additions, 1 deletionbuild/doxygen/doxygen_footer.html
- build/makepack-dolibarr.pl 1 addition, 0 deletionsbuild/makepack-dolibarr.pl
- htdocs/.gitignore 1 addition, 1 deletionhtdocs/.gitignore
- htdocs/admin/agenda_other.php 1 addition, 1 deletionhtdocs/admin/agenda_other.php
- htdocs/admin/company.php 2 additions, 2 deletionshtdocs/admin/company.php
- htdocs/admin/const.php 25 additions, 28 deletionshtdocs/admin/const.php
- htdocs/admin/dict.php 3 additions, 3 deletionshtdocs/admin/dict.php
- htdocs/admin/triggers.php 1 addition, 1 deletionhtdocs/admin/triggers.php
- htdocs/cashdesk/deconnexion.php 6 additions, 0 deletionshtdocs/cashdesk/deconnexion.php
- htdocs/cashdesk/facturation_dhtml.php 3 additions, 2 deletionshtdocs/cashdesk/facturation_dhtml.php
- htdocs/cashdesk/facturation_verif.php 6 additions, 0 deletionshtdocs/cashdesk/facturation_verif.php
- htdocs/cashdesk/index_verif.php 6 additions, 0 deletionshtdocs/cashdesk/index_verif.php
- htdocs/cashdesk/validation.php 6 additions, 0 deletionshtdocs/cashdesk/validation.php
- htdocs/cashdesk/validation_ok.php 9 additions, 3 deletionshtdocs/cashdesk/validation_ok.php
- htdocs/cashdesk/validation_ticket.php 6 additions, 0 deletionshtdocs/cashdesk/validation_ticket.php
- htdocs/cashdesk/validation_verif.php 6 additions, 0 deletionshtdocs/cashdesk/validation_verif.php
- htdocs/comm/admin/propal_extrafields.php 2 additions, 2 deletionshtdocs/comm/admin/propal_extrafields.php
- htdocs/comm/propal.php 1 addition, 1 deletionhtdocs/comm/propal.php
- htdocs/comm/propal/document.php 1 addition, 1 deletionhtdocs/comm/propal/document.php
Loading
Please register or sign in to comment