-
- Downloads
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
Conflicts: htdocs/comm/action/card.php
No related branches found
No related tags found
Showing
- htdocs/comm/action/card.php 5 additions, 3 deletionshtdocs/comm/action/card.php
- htdocs/comm/propal/class/propal.class.php 1 addition, 12 deletionshtdocs/comm/propal/class/propal.class.php
- htdocs/contact/class/contact.class.php 3 additions, 3 deletionshtdocs/contact/class/contact.class.php
- htdocs/core/boxes/box_services_contracts.php 3 additions, 6 deletionshtdocs/core/boxes/box_services_contracts.php
- htdocs/core/lib/treeview.lib.php 6 additions, 3 deletionshtdocs/core/lib/treeview.lib.php
- htdocs/user/class/user.class.php 20 additions, 9 deletionshtdocs/user/class/user.class.php
- htdocs/user/hierarchy.php 9 additions, 1 deletionhtdocs/user/hierarchy.php
Loading
Please register or sign in to comment