Daniel Barbero Martin 5504741a9d Merge remote-tracking branch 'origin/develop' into ent-3595-discovery-fase-2 ... Conflicts: pandora_console/include/class/ConsoleSupervisor.php Former-commit-id: d734637dea22b18b1d30a3d8575cd45500558e29		2019-03-26 18:48:49 +01:00
..
DEBIAN	Auto-updated build strings.	2019-03-26 00:01:25 +01:00
attachment	…
extensions	New view user edit	2019-03-20 13:26:15 +01:00
extras	Merge branch 'ent-3595-discovery-fase-2' of https://brutus.artica.lan:8081/artica/pandorafms into ent-3595-discovery-fase-2	2019-03-26 13:06:12 +01:00
fonts	…
general	Merge remote-tracking branch 'origin/develop' into ent-3595-discovery-fase-2	2019-03-26 16:32:19 +01:00
godmode	breadcrum improvement discovery	2019-03-26 17:28:31 +01:00
images	Merge remote-tracking branch 'origin/develop' into ent-3595-discovery-fase-2	2019-03-25 20:14:24 +01:00
include	Merge remote-tracking branch 'origin/develop' into ent-3595-discovery-fase-2	2019-03-26 18:48:49 +01:00
mobile	…
operation	minor fix	2019-03-26 16:54:11 +01:00
vendor	…
.gitignore	…
AUTHORS	…
COPYING	…
DB_Dockerfile	…
Dockerfile	…
ajax.php	…
composer.json	…
composer.lock	…
docker_entrypoint.sh	…
index.php	Merge remote-tracking branch 'origin/develop' into ent-3595-discovery-fase-2	2019-03-26 18:48:49 +01:00
install.php	Auto-updated build strings.	2019-03-26 00:01:25 +01:00
pandora_console.redhat.spec	Auto-updated build strings.	2019-03-26 00:01:25 +01:00
pandora_console.spec	Auto-updated build strings.	2019-03-26 00:01:25 +01:00
pandora_console_install	Updated version and build strings.	2019-02-27 11:25:50 +01:00
pandora_console_logrotate_centos	…
pandora_console_logrotate_suse	…
pandora_console_logrotate_ubuntu	…
pandora_console_upgrade	…
pandoradb.sql	discovery task advanced summary support	2019-03-25 17:32:18 +01:00
pandoradb_data.sql	Merge remote-tracking branch 'origin/ent-3610-Vista-Edicion-de-Usuario' into ent-3595-discovery-fase-2	2019-03-20 15:46:33 +01:00