Exclude conf.php file from git
fix some trad
Merge pull request #1181 from grandoc/3.3

fix some trad
Merge pull request #1192 from altairis-fr/3.4

fix margin reports bugs (wrong group by + jquery syntax error)
Fix: [ bug #1039 ] Pre-defined invoices conversion
Merge remote-tracking branch 'origin/3.3' into 3.4
Fix: Bad translation (to pick to 3.4)

Conflicts:
	htdocs/langs/en_US/main.lang
	htdocs/langs/fr_FR/main.lang
Revert a bad fix.
Fix: If only service module is activated, it's impossible to delete
service
Update parameter as expected by the function name
Merge pull request #1198 from FHenry/3.4

Fix: If only service module is activated, it's impossible to delete
Merge pull request #1199 from GPCsolutions/3.4-fixmissingparameter

Update parameter as expected by the function name
Fix: [ bug #1043 ] Bad interventions ref numbering
Fix: Add missing syslog
Merge branch '3.4' of git@github.com:Dolibarr/dolibarr.git into 3.4
Fix: Mailing module : if an email is already in destinaires list all
other email from selector was not inserted
Merge pull request #1201 from FHenry/3.4

Fix: Mailing module : if an email is already in destinaires list all
Fix: Localtaxes balance not showing
Fix: Intervention box links to contracts id
Fix: select list on external table

Conflicts:
	htdocs/core/class/extrafields.class.php