Juan Ferrer Toribio 0ad3bd1a44 Merge branch 'master' into dev		2016-10-27 13:28:41 +02:00
..
address	Directorio traducciones ahora es /locale/.json	2016-10-20 18:37:28 +02:00
address-list	Directorio traducciones ahora es /locale/.json	2016-10-20 18:37:28 +02:00
conf	Merge branch 'master' into dev	2016-10-27 13:28:41 +02:00