pandorafms/pandora_console/general
fbsanchez c3232b0f2a Merge remote-tracking branch 'origin/develop' into ent-7010-nexcon-mejoras-widget-de-eventos
Conflicts:
	pandora_console/include/class/ConsoleSupervisor.php
2021-03-24 09:55:31 +01:00
..
first_task
license
ui
alert_enterprise.php
cg_items.php
check_image_module.php
error_screen.php
footer.php
header.php
help_feedback.php
last_message.php
links_menu.php
login_help_dialog.php
login_page.php
logoff.php
logon_failed.php
logon_ok.php
main_menu.php
mysqlerr.php
news_dialog.php
noaccess.php
noaccess2.php
noaccesssaml.php
pandora_help.php
php7_message.php
register.php
sap_view.php
subselect_data_module.php