Juan Ferrer Toribio 0ad3bd1a44 Merge branch 'master' into dev		2016-10-27 13:28:41 +02:00
..
locale	Directorio traducciones ahora es /locale/.json	2016-10-20 18:37:28 +02:00
conf.js	Account synchronization, minor changes	2016-10-27 13:22:04 +02:00
style.css	Backup	2016-10-11 16:45:10 +02:00
ui.xml	Traducciones actualizadas, Htk.Dialog, env.php, errores solucionados	2016-10-20 10:37:08 +02:00