Closed vitornvpaixao closed 3 years ago
Oh oh, there are conflicts :fearful:
Yap, the conflicts were about stupid things that were already changed at some point in feature branch for staging. They are already solved but still doesn't allow use the rebase and merge, only squash and merge and normal merge. I will use the normal one.
Features:
Improvements: