Merge branch 'feature/chat' into developer

This commit is contained in:
tiago.kayaya
2021-01-25 12:00:05 +01:00
33 changed files with 1599 additions and 301 deletions
@@ -635,7 +635,13 @@ __webpack_require__.r(__webpack_exports__);
const environment = {
production: false,
apiURL: 'https://equilibrium.dyndns.info/GabineteDigital.Services/V4/api/',
<<<<<<< HEAD
apiChatUrl: 'http://chat.gabinetedigital.local:3000/api/v1/',
=======
/* apiURL: 'http://gpr-dev-01.gabinetedigital.local/GabineteDigital.Services/V3/api/', */
apiChatUrl: 'https://www.tabularium.pt/api/v1/',
/* apiChatUrl: 'http://chat.gabinetedigital.local:3000/api/v1/', */
>>>>>>> feature/chat
domain: 'gabinetedigital.local',
defaultuser: 'paulo.pinto',
defaultuserpwd: 'tabteste@006'