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

Browse Source

develop

Conflicts:
	htdocs/langs/en_US/stocks.lang
	htdocs/langs/fr_FR/stocks.lang

...

This commit is contained in:

Laurent Destailleur 2013-10-09 21:10:31 +02:00

parent a11a0d6491 864315d018

commit 0f343d3f8a

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