pandorafms/pandora_console/extras
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
..
check_other_languages.sh 2012-10-09 Miguel de Dios <miguel.dedios@artica.es> 2012-10-09 15:51:33 +00:00
pandora_diag.php 2013-10-16 Miguel de Dios <miguel.dedios@artica.es> 2013-10-16 10:30:35 +00:00
pandoradb_migrate_5.1_to_6.0.mysql.sql Merge branch 'feature/ticket#1579-TwoFactorAuthentication' into develop 2014-12-15 15:06:29 +01:00
pandoradb_migrate_5.1_to_6.0.oracle.sql Merge branch 'feature/ticket#1579-TwoFactorAuthentication' into develop 2014-12-15 15:06:29 +01:00
pandoradb_migrate_5.1_to_6.0.postgreSQL.sql Merge branch 'feature/ticket#1579-TwoFactorAuthentication' into develop 2014-12-15 15:06:29 +01:00
sample_login.php Fixed the lost hash user in the links from metaconsole to the nodes. 2014-11-25 11:07:41 +01:00