2
0
forked from Wavyzz/dolibarr
Files
dolibarr-fork/htdocs/admin/tools
Laurent Destailleur 469dd03673 Merge remote-tracking branch 'origin/3.4' into develop
Conflicts:
	build/debian/changelog
	build/exe/doliwamp/doliwamp.iss
	build/makepack-dolibarr.pl
	build/rpm/dolibarr_fedora.spec
	build/rpm/dolibarr_generic.spec
	build/rpm/dolibarr_mandriva.spec
	build/rpm/dolibarr_opensuse.spec
	htdocs/core/class/commonobject.class.php
	htdocs/core/tpl/objectline_view.tpl.php
	htdocs/filefunc.inc.php
	htdocs/langs/nl_NL/margins.lang
2013-11-01 17:58:38 +01:00
..
2013-11-01 17:20:36 +01:00