chore: merge last master change into full-id-service

linagora / ToM-server

GNU Affero General Public License v3.0

14 stars 3 forks source link

chore: merge last master change into full-id-service #97

Closed guimard closed 4 months ago

guimard commented 4 months ago

@rezk2ll just pushed a new API into ToM-Server. However changes in DB organization into full-id-service branch doesn't allow to simply merge master into full-id-service.

Please fix this merge

guimard commented 4 months ago

Typo: when you fall to "Missing .git/MERGE_HEAD" bug, use "HUSKY=0 git merge" instead of "git merge"

guimard commented 4 months ago

Done via #98