Commit Graph

6 Commits

Author SHA1 Message Date
Laurent Destailleur
83447243ae Merge remote-tracking branch 'origin/3.6' into develop
Conflicts:
	build/debian/get-orig-source.sh
	htdocs/product/class/product.class.php
	htdocs/societe/soc.php
2014-09-15 22:58:39 +02:00
Laurent Destailleur
ba70c1a08a Fix: typo on debian files 2014-09-13 20:47:34 +02:00
Laurent Destailleur
9d2d165cfc Fix: debian key dfsg and not dsfg 2014-09-07 11:21:04 +02:00
Laurent Destailleur
bd0e328d5b Use official package directly to build debian. 2013-09-19 23:51:47 +02:00
Laurent Destailleur
30c4d5dedb Fix for debian package 2013-09-19 00:39:13 +02:00
Laurent Destailleur
c71c4e86f6 Fix: watch file for debian package. 2013-09-05 23:52:13 +02:00