Merge main and conflicts solving

This commit is contained in:
Gabriel Rosa
2022-08-03 13:36:31 -03:00
53 changed files with 160 additions and 178 deletions
@@ -13,7 +13,7 @@ import {
import { ApiBearerAuth, ApiTags } from '@nestjs/swagger';
import { ConnectionClientService } from './client.service';
import { CreateConnectionDto } from './dtos/create-connection';
import { DadosferaLogger } from 'dadosfera-logs';
import { DadosferaLogger } from '@dadosfera/dadosfera-logs';
import {
Authenticated,
RequireAllPermissions,