Merge branch 'develop' into fr-2613
Conflicts: htdocs/install/mysql/migration/3.7.0-3.8.0.sql
No related branches found
No related tags found
Showing
- .editorconfig 4 additions, 8 deletions.editorconfig
- COPYRIGHT 1 addition, 0 deletionsCOPYRIGHT
- dev/translation/sanity_check_en_langfiles.php 60 additions, 0 deletionsdev/translation/sanity_check_en_langfiles.php
- htdocs/adherents/admin/public.php 2 additions, 2 deletionshtdocs/adherents/admin/public.php
- htdocs/adherents/card.php 1 addition, 1 deletionhtdocs/adherents/card.php
- htdocs/admin/company.php 2 additions, 2 deletionshtdocs/admin/company.php
- htdocs/admin/dict.php 1 addition, 1 deletionhtdocs/admin/dict.php
- htdocs/cashdesk/admin/cashdesk.php 1 addition, 1 deletionhtdocs/cashdesk/admin/cashdesk.php
- htdocs/categories/class/categorie.class.php 1 addition, 1 deletionhtdocs/categories/class/categorie.class.php
- htdocs/comm/askpricesupplier/card.php 4 additions, 0 deletionshtdocs/comm/askpricesupplier/card.php
- htdocs/comm/card.php 10 additions, 4 deletionshtdocs/comm/card.php
- htdocs/comm/index.php 97 additions, 0 deletionshtdocs/comm/index.php
- htdocs/comm/propal.php 5 additions, 0 deletionshtdocs/comm/propal.php
- htdocs/commande/card.php 1 addition, 0 deletionshtdocs/commande/card.php
- htdocs/compta/bank/releve.php 1 addition, 1 deletionhtdocs/compta/bank/releve.php
- htdocs/compta/facture.php 11 additions, 6 deletionshtdocs/compta/facture.php
- htdocs/compta/facture/mergepdftool.php 4 additions, 0 deletionshtdocs/compta/facture/mergepdftool.php
- htdocs/compta/stats/index.php 1 addition, 1 deletionhtdocs/compta/stats/index.php
- htdocs/core/class/commonobject.class.php 14 additions, 13 deletionshtdocs/core/class/commonobject.class.php
- htdocs/core/class/html.formmail.class.php 9 additions, 6 deletionshtdocs/core/class/html.formmail.class.php
Loading
Please register or sign in to comment