Merge branch '3.6' of github.com:atm-maxime/dolibarr into 3.6

Browse Source

Conflicts:
	htdocs/core/tpl/objectline_create.tpl.php

...

This commit is contained in:

MAxime Kohlhaas 2014-10-25 19:23:48 +02:00

parent 374b761fdf 26ccb79f24

commit cb2744a866

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

Diff Content Not Available