-
- Downloads
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts: htdocs/core/class/html.form.class.php htdocs/langs/en_US/loan.lang htdocs/theme/eldy/style.css.php htdocs/theme/md/style.css.php
No related branches found
No related tags found
Showing
- htdocs/admin/modules.php 2 additions, 0 deletionshtdocs/admin/modules.php
- htdocs/comm/remise.php 2 additions, 0 deletionshtdocs/comm/remise.php
- htdocs/core/class/commonobject.class.php 5 additions, 4 deletionshtdocs/core/class/commonobject.class.php
- htdocs/core/class/html.form.class.php 1 addition, 1 deletionhtdocs/core/class/html.form.class.php
- htdocs/core/db/Database.interface.php 1 addition, 1 deletionhtdocs/core/db/Database.interface.php
- htdocs/core/lib/company.lib.php 3 additions, 1 deletionhtdocs/core/lib/company.lib.php
- htdocs/core/modules/import/import_csv.modules.php 6 additions, 6 deletionshtdocs/core/modules/import/import_csv.modules.php
- htdocs/core/tpl/resource_add.tpl.php 2 additions, 2 deletionshtdocs/core/tpl/resource_add.tpl.php
- htdocs/langs/en_US/loan.lang 1 addition, 0 deletionshtdocs/langs/en_US/loan.lang
- htdocs/theme/eldy/style.css.php 5 additions, 3 deletionshtdocs/theme/eldy/style.css.php
- htdocs/theme/md/style.css.php 1 addition, 1 deletionhtdocs/theme/md/style.css.php
Loading
Please register or sign in to comment