MIERDA
mierda
Merge branch 'master' of https://github.com/ramsodev/DitaManagement

Conflicts:
	interface/DitaManagement/src/repository.properties
Pantalla basica de edición de propiedades