Skip to content

Commit

Permalink
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
Browse files Browse the repository at this point in the history 
Conflicts:
	htdocs/adherents/class/adherent.class.php
	htdocs/core/actions_massactions.inc.php
	htdocs/core/tpl/massactions_pre.tpl.php
  • Loading branch information
@eldy
eldy committed Jun 24, 2019
2 parents 0854984 + 3c49568 commit 3d185b6
Show file tree
Hide file tree
Showing 2 changed files with 1,071 additions and 1,048 deletions.

0 comments on commit 3d185b6

Please sign in to comment.