Alejandro Gallardo Escobar 52e6dda3b4 Merge branch 'feature/ticket#1579-TwoFactorAuthentication' into develop ... Resolved conflicts: pandora_console/extras/pandoradb_migrate_5.1_to_6.0.mysql.sql pandora_console/extras/pandoradb_migrate_5.1_to_6.0.oracle.sql pandora_console/extras/pandoradb_migrate_5.1_to_6.0.postgreSQL.sql pandora_console/include/styles/pandora.css		2014-12-15 15:06:29 +01:00
..
images	…
cluetip.css	…
color-picker.css	…
common.css	…
countdown.css	…
datepicker.css	…
dialog.css	2014-06-02 Sergio Martin <sergio.martin@artica.es>	2014-06-02 16:57:20 +00:00
help.css	…
ie.css	…
install.css	…
jquery-ui-1.8.17.custom.css	…
jquery-ui-1.8.23.custom.css	…
jquery-ui-1.10.0.custom.css	Changes some bad colors and others aesthetic changes. Thanks Carla.	2014-09-04 12:19:55 +02:00
menu.css	2014-08-04 Alejandro Gallardo <alejandro.gallardo@artica.es>	2014-08-04 16:50:36 +00:00
pandora.css	Merge branch 'feature/ticket#1579-TwoFactorAuthentication' into develop	2014-12-15 15:06:29 +01:00
pandora_black.css	2014-08-26 Miguel de Dios <miguel.dedios@artica.es>	2014-08-26 12:22:33 +00:00
pandora_blackmetal.css	…
pandora_forms.css	…
pandora_green.css	…
pandora_legacy.css	Added font styles for 4 and 6pt for the labels	2014-09-11 17:50:42 +02:00
pandora_minimal.css	…