Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git

Browse Source

into develop

Conflicts:
	htdocs/core/ajax/extraparams.php

...

This commit is contained in:

Regis Houssin 2012-03-17 09:47:56 +01:00

parent 181fac1d9d 938d0beccf

commit e16b1067cd

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