Alejandro Fraguas 20d7598abb Merge branch '3145-Fallback_to_local_and_save_password' into 'develop' ... Save password option disabled if Fallback is enabled See merge request artica/pandorafms!2137 Former-commit-id: 48390e003cad5f9393282907587d51ce9a92dfd8		2019-02-13 10:07:58 +01:00
..
DEBIAN	Auto-updated build strings.	2019-02-13 00:01:37 +01:00
attachment	Changed the format of the .js and .html files	2019-01-30 12:27:18 +01:00
extensions	Merge remote-tracking branch 'origin/develop' into 3446-Imagen-grupos-no-se-muestra-None	2019-02-07 08:59:45 +01:00
extras	Merge branch 'develop' into cursed-format-change	2019-01-31 09:42:10 +01:00
fonts	…
general	Fixed conflict	2019-02-07 17:33:43 +01:00
godmode	Merge branch 'develop' into 3145-Fallback_to_local_and_save_password	2019-02-12 18:55:48 +01:00
images	Merge remote-tracking branch 'origin/develop' into 2952_Mejora_en_wizard_para_crear_agentes_desde_la_metaconsola	2018-12-26 17:51:11 +01:00
include	Auto-updated build strings.	2019-02-13 00:01:37 +01:00
mobile	Changed the format of the .php files	2019-01-30 16:18:44 +01:00
operation	Merge remote-tracking branch 'origin/develop' into 3446-Imagen-grupos-no-se-muestra-None	2019-02-07 08:59:45 +01:00
vendor	…
.gitignore	…
AUTHORS	…
COPYING	…
DB_Dockerfile	…
Dockerfile	…
ajax.php	Changed the format of the .php files	2019-01-30 16:18:44 +01:00
composer.json	Changed the format of the .js and .html files	2019-01-30 12:27:18 +01:00
composer.lock	…
docker_entrypoint.sh	…
index.php	Changed the format of the .php files	2019-01-30 16:18:44 +01:00
install.php	Auto-updated build strings.	2019-02-13 00:01:37 +01:00
pandora_console.redhat.spec	Auto-updated build strings.	2019-02-13 00:01:37 +01:00
pandora_console.spec	Auto-updated build strings.	2019-02-13 00:01:37 +01:00
pandora_console_install	Updated version and build strings.	2019-01-29 11:08:54 +01:00
pandora_console_logrotate_centos	…
pandora_console_logrotate_suse	…
pandora_console_logrotate_ubuntu	…
pandora_console_upgrade	…
pandoradb.sql	Revert "Added tnetwork_matrix data structure"	2019-01-21 18:43:35 +01:00
pandoradb_data.sql	fixed mr token	2019-01-30 17:11:48 +01:00