Merge branch 'main' of https://gitlab.gosmartcrm.com/go-smart/app_agenda into main

# Conflicts:
#	assets/scripts/custom.js
