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
..
ajax	Look and feel v14	2021-03-26 17:58:00 +01:00
boxes	Merge pull request #16988 from daraelmin/daraelmin-patch-excluded	2021-03-29 17:39:58 +02:00
class	Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop	2021-03-29 21:47:31 +02:00
data	Create index.html	2021-03-21 21:34:21 +01:00
db
filemanagerdol
js	Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop	2021-02-26 19:23:23 +01:00
lib	Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop	2021-03-29 21:47:31 +02:00
login	fix typo	2021-03-02 12:41:34 +01:00
menus	Fix trans	2021-03-22 16:18:31 +01:00
modules	Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop	2021-03-29 21:47:31 +02:00
tpl	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0	2021-03-29 21:37:21 +02:00
triggers	Clean code	2021-03-15 00:01:55 +01:00
actions_addupdatedelete.inc.php	Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop	2021-03-05 19:29:09 +01:00
actions_builddoc.inc.php
actions_changeselectedfields.inc.php
actions_comments.inc.php
actions_dellink.inc.php
actions_extrafields.inc.php
actions_fetchobject.inc.php
actions_lineupdown.inc.php
actions_linkedfiles.inc.php
actions_massactions.inc.php
actions_printing.inc.php
actions_sendmails.inc.php	add missing rule	2021-03-01 20:37:16 +01:00
actions_setmoduleoptions.inc.php	add missing rule	2021-03-01 20:37:16 +01:00
actions_setnotes.inc.php
antispamimage.php
commonfieldsinexport.inc.php
customreports.php	add missing rule	2021-03-01 20:37:16 +01:00
datepicker.php	add missing rule	2021-03-01 20:37:16 +01:00
doxygen.php
extrafieldsinexport.inc.php	add missing rule	2021-03-01 20:37:16 +01:00
get_info.php
get_menudiv.php
index.html
photos_resize.php	Look and feel v14	2021-03-24 01:53:08 +01:00
search_page.php
search.php
tools.php
website.inc.php