Tatiana Llorente 1aa0131a81 Merge branch 'develop' into 'ent-4195-Status-sets-Visual' ... Conflicts: pandora_console/include/styles/pandora.css		2019-07-02 11:42:19 +02:00
..
DEBIAN	Auto-updated build strings.	2019-07-02 00:01:09 +02:00
attachment	…
extensions	Merge branch 'ent-4250-Cambios-de-estilo-pendientes_2' into 'develop'	2019-07-01 10:02:02 +02:00
extras	Revert 28.sql	2019-06-27 15:04:58 +02:00
fonts	…
general	Merge branch 'ent-3800-mal-enrutamiento-discovery' into 'develop'	2019-06-26 12:02:43 +02:00
godmode	Merge branch 'ent-2094-Añadir-buscador-en-operaciones-masivas' into 'develop'	2019-07-02 11:37:01 +02:00
images	Merge branch 'develop' into 'ent-4195-Status-sets-Visual'	2019-07-02 11:42:19 +02:00
include	Merge branch 'develop' into 'ent-4195-Status-sets-Visual'	2019-07-02 11:42:19 +02:00
mobile	Events agent grouped	2019-06-12 18:19:39 +02:00
operation	Merge branch 'ent-3965-Ordenado-y-validado-de-alertas-disparadas' into 'develop'	2019-07-01 15:41:04 +02:00
tests	…
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-4136-button-styles	2019-06-12 13:17:36 +02:00
install.php	Auto-updated build strings.	2019-07-02 00:01:09 +02:00
pandora_console.redhat.spec	Auto-updated build strings.	2019-07-02 00:01:09 +02:00
pandora_console.rhel7.spec	Auto-updated build strings.	2019-07-02 00:01:09 +02:00
pandora_console.spec	Auto-updated build strings.	2019-07-02 00:01:09 +02:00
pandora_console_install	Updated version and build strings.	2019-06-26 13:25:57 +02:00
pandora_console_logrotate_centos	…
pandora_console_logrotate_suse	…
pandora_console_logrotate_ubuntu	…
pandora_console_upgrade	…
pandoradb.sql	Minor fixes	2019-06-27 10:39:43 +02:00
pandoradb_data.sql	update current package	2019-06-26 15:37:04 +02:00