eiximenis e8e65c5764 Merge branch 'dev' ...

# Conflicts:
#	docs/Microservicios-NET-Arquitectura-para-aplicaciones-NET-Contenerizadas-(Microsoft-eBook)-es-ES.pdf
#	docs/NET-Microservices-Architecture-for-Containerized-NET-Applications-(Microsoft-eBook).pdf
#	docs/NET-Microservices-Architecture-for-Containerized-NET-Applications-(Microsoft-for-Kindle).mobi
#	docs/NET-Microservices-Architecture-for-Containerized-NET-Applications-(Microsoft-for-eReader).epub
#	readme/readme-docker-compose.md

2018-04-05 09:58:10 +02:00

..

BuildingBlocks

Revert "Simplified the SettingsService in the mobile client."

2018-03-29 14:07:18 +01:00

Mobile

Merge branch 'dev'

2018-04-05 09:58:10 +02:00

Services

drop rudements from identity api

2018-04-02 14:17:03 +03:00

Web

Revert "Simplified the SettingsService in the mobile client."

2018-03-29 14:07:18 +01:00