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

Conflicts:
	htdocs/comm/card.php
This commit is contained in:
Laurent Destailleur
2020-08-02 22:42:17 +02:00
2 changed files with 3 additions and 4 deletions

View File

@@ -387,7 +387,6 @@ if ($mode == 'config' && $user->admin) {
// mode = template
if ($mode == 'template' && $user->admin) {
dol_fiche_head($head, $mode, $langs->trans("ModuleSetup"), -1, 'technic');
print '<form method="post" action="'.$_SERVER["PHP_SELF"].'?mode=template" autocomplete="off">';