Laurent Destailleur fe3f701928 Merge remote-tracking branch 'origin/3.7' into develop ...

Conflicts:
	ChangeLog
	build/debian/changelog
	build/exe/doliwamp/doliwamp.iss
	htdocs/expedition/list.php
	htdocs/filefunc.inc.php
	htdocs/install/mysql/migration/3.6.0-3.7.0.sql
	htdocs/user/class/user.class.php

2015-05-16 17:09:42 +02:00

..

admin

Change generic and setup image title

2015-04-18 23:13:48 +02:00

class

Merge remote-tracking branch 'origin/3.7' into develop

2015-05-16 17:09:42 +02:00

group

Uniformize code

2015-05-04 11:41:30 +02:00

agenda_extsites.php

Merge remote-tracking branch 'origin/3.7' into develop

2014-12-08 17:51:36 +01:00

card.php

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

2015-05-15 11:16:29 +02:00

clicktodial.php

Save regressions

2015-05-13 09:32:54 +02:00

document.php

Save regressions

2015-05-13 09:32:54 +02:00

hierarchy.php

Minor fixes

2015-05-13 07:46:12 +02:00

home.php

NEW: Feature request: A page to merge two thirdparties into one #2613

2015-04-18 20:41:09 +02:00

index.php

Minor fixes

2015-05-13 07:46:12 +02:00

info.php

Save regressions

2015-05-13 09:32:54 +02:00

ldap.php

Save regressions

2015-05-13 09:32:54 +02:00

logout.php

Fix: missing global declarations

2014-08-20 19:03:58 +02:00

note.php

Save regressions

2015-05-13 09:32:54 +02:00

param_ihm.php

Save regressions

2015-05-13 09:32:54 +02:00

passwordforgotten.php

Fix: A little clean of dol_hash usage.

2014-10-18 16:08:15 +02:00

perms.php

Save regressions

2015-05-13 09:32:54 +02:00