Merge branches 'developer' and 'developer' of https://bitbucket.org/equilibriumito/gabinete-digital into developer

This commit is contained in:
ivan gomes
2021-11-22 15:27:49 +01:00
@@ -29,7 +29,11 @@
<ion-item lines="none">
<ion-thumbnail slot="start">
<<<<<<< HEAD
<ion-img [(ngModel)]="capturedImage" name="image" ngDefaultControl [src]="capturedImage" (click)="imageSize(capturedImage)" ></ion-img>
=======
<ion-img [(ngModel)]="capturedImage" name="image" ngDefaultControl [src]="capturedImage" ></ion-img>
>>>>>>> 6dcc59980c0116ee04582f93d3d44cc985659ce6
<ion-row>
<ion-col>
<img src="" #imageElement/>