Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7

Browse Source

Conflicts:
	htdocs/comm/action/class/actioncomm.class.php

...

This commit is contained in:

Laurent Destailleur 2015-01-18 12:31:01 +01:00

parent 6a294eb02a 012c571a6c

commit ef802d9c39

1 changed files with 1 additions and 1 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files