Merge branch 'bugfix/aproveEventoBugOnDetails' into develop

This commit is contained in:
gilson.manuel
2022-06-29 15:49:01 +01:00
7 changed files with 306 additions and 202 deletions
@@ -131,10 +131,6 @@
<ion-icon slot="start" src="assets/images/icons-calendar.svg"></ion-icon>
</div>
<div class="ion-input-class width-100">
<<<<<<< HEAD
=======
>>>>>>> secrete-group
<mat-form-field appearance="none"
class="width-100 date-hour-picker">