Merge branch 'fix_getentity' of github.com:aternatik/dolibarr into fix_getentity

Browse Source

Conflicts:
	htdocs/accountancy/journal/purchasesjournal.php

...

This commit is contained in:

jfefe 2015-04-19 03:09:12 +02:00

parent f5db4d5bb7 0c7ae0dd47

commit e1665be324

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