Files
iTop/lib
Eric 8edc7c7ce0 Merge branch 'develop' into feature/faf_doc_twig_blocks
# Conflicts:
#	core/pdfbulkexport.class.inc.php
#	css/backoffice/components/_datatable.scss
#	css/backoffice/components/_field.scss
#	datamodels/2.x/itop-structure/precompiled-themes/fullmoon/main.css
#	datamodels/2.x/itop-structure/precompiled-themes/test-red/main.css
#	dictionaries/de.dictionary.itop.ui.php
#	js/search/search_form_handler.js
#	sources/application/UI/Base/Component/DataTable/DataTableUIBlockFactory.php
#	templates/base/components/datatable/layout.ready.js.twig
#	webservices/export-v2.php
2021-06-18 17:22:04 +02:00
..