dolibarr/htdocs/user
Laurent Destailleur 1f5bea01f5 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/class/html.formother.class.php
	htdocs/core/lib/functions.lib.php
	htdocs/core/modules/commande/doc/pdf_einstein.modules.php
	htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php
	htdocs/core/modules/facture/doc/pdf_crabe.modules.php
	htdocs/core/modules/facture/doc/pdf_sponge.modules.php
	htdocs/core/modules/propale/doc/pdf_azur.modules.php
	htdocs/core/modules/propale/doc/pdf_cyan.modules.php
	htdocs/fourn/class/fournisseur.product.class.php
	htdocs/product/fournisseurs.php
	htdocs/user/card.php
2019-11-14 21:30:16 +01:00
..
admin Move Gnu.org to https 2019-09-23 21:55:30 +02:00
class Scrutinizer Auto-Fixes 2019-11-13 18:35:39 +00:00
group Merge pull request #12429 from Dolibarr/scrutinizer-patch-5 2019-11-14 08:50:24 +01:00
notify replace deprecated user->societe_id by user->socid 2019-10-31 20:46:31 +01:00
agenda_extsites.php replace deprecated user->societe_id by user->socid 2019-10-31 20:46:31 +01:00
bank.php Scrutinizer Auto-Fixes 2019-11-11 23:15:34 +00:00
card.php Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-11-14 21:30:16 +01:00
clicktodial.php Scrutinizer Auto-Fixes 2019-11-13 18:35:39 +00:00
document.php replace deprecated user->societe_id by user->socid 2019-10-31 20:46:31 +01:00
hierarchy.php Update hierarchy.php 2019-11-04 20:28:10 +01:00
home.php Update home.php 2019-11-04 20:29:33 +01:00
index.html Create index.html 2018-09-30 14:56:12 +02:00
info.php replace deprecated user->societe_id by user->socid 2019-10-31 20:46:31 +01:00
ldap.php replace deprecated user->societe_id by user->socid 2019-10-31 20:46:31 +01:00
list.php Scrutinizer Auto-Fixes 2019-11-13 18:37:08 +00:00
logout.php Scrutinizer Auto-Fixes 2019-11-13 18:37:08 +00:00
note.php replace deprecated user->societe_id by user->socid 2019-10-31 20:46:31 +01:00
param_ihm.php 100% centpercent 2019-11-05 21:24:41 +01:00
passwordforgotten.php Scrutinizer Auto-Fixes 2019-11-14 11:09:15 +00:00
perms.php Merge pull request #12283 from frederic34/socid 2019-11-02 13:34:21 +01:00