Laurent Destailleur 843e0a2c39 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/adherents/card.php htdocs/core/class/html.formother.class.php htdocs/core/modules/societe/doc/doc_generic_odt.modules.php htdocs/projet/tasks/time.php htdocs/webservices/server_thirdparty.php		2021-03-29 21:47:31 +02:00
..
admin	Merge pull request #16899 from daraelmin/daraelmin-status-exclu	2021-03-21 20:56:07 +01:00
canvas	$_POST war	2021-03-24 19:53:31 +01:00
cartes	fix php8 warnings	2021-03-19 17:23:28 +01:00
class	Update adherent.class.php	2021-03-29 17:38:37 +02:00
stats	update subscription and type	2021-03-18 23:23:57 +01:00
subscription	Look and feel v14	2021-03-26 18:16:12 +01:00
tpl	Scrutinizer Auto-Fixes	2020-10-31 13:32:18 +00:00
agenda.php	Fixing style errors.	2021-03-19 08:15:14 +00:00
card.php	Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop	2021-03-29 21:47:31 +02:00
document.php	FIX #yogosha5747	2021-03-29 15:25:28 +02:00
htpasswd.php	FIX #yogosha5747	2021-03-29 15:25:28 +02:00
index.php	Update index.php	2021-03-29 17:39:11 +02:00
ldap.php	FIX #yogosha5747	2021-03-29 15:25:28 +02:00
list.php	Add some protection for SQL injection	2021-03-22 13:31:06 +01:00
note.php	FIX #yogosha5765	2021-03-29 21:04:33 +02:00
subscription.php	FIX #yogosha5747	2021-03-29 15:25:28 +02:00
type_ldap.php	add new rule	2021-03-01 00:19:52 +01:00
type_translation.php	Update type_translation.php	2021-03-19 09:19:28 +01:00
type.php	merge develop	2021-03-20 15:34:30 +01:00
vcard.php	FIX #yogosha5747	2021-03-29 15:25:28 +02:00