Juan Ferrer 7a1bb7e68d Merge branch 'dev' into 1882-descriptorRefactor		2020-05-08 14:01:49 +02:00
..
back	preparado para PR	2020-03-26 17:41:40 +01:00
front	Merge branch 'dev' into 1882-descriptorRefactor	2020-05-08 14:01:49 +02:00