chore: merge conflict resolve (main->dev) (!444) · Merge requests · minerva / frontend · GitLab

Snippets Groups Projects

Merged Miłosz Grocholewski requested to merge feat/marge-main-to-development into development 2 weeks ago

Activity

Miłosz Grocholewski assigned to @KonradAt 2 weeks ago

assigned to @KonradAt
Miłosz Grocholewski added 1 commit 2 weeks ago
added 1 commit

13839634 - fix code styling

Compare with previous version
Konrad Przybysz approved this merge request 2 weeks ago

approved this merge request
Miłosz Grocholewski deleted the bugfix/search-reactions branch. This merge request now targets the development branch 3 days ago

deleted the bugfix/search-reactions branch. This merge request now targets the development branch
Miłosz Grocholewski added 1 commit 3 days ago
added 1 commit

d0ed8fec - feat(search-reactions): add alpha to inactive reaction | set correct reactions...

Compare with previous version
Miłosz Grocholewski added 31 commits 3 days ago
added 31 commits

d0ed8fec...50dece36 - 30 commits from branch development

d39a4994 - chore: merge conflict resolve

Compare with previous version
Miłosz Grocholewski enabled an automatic merge when all merge checks for d39a4994 pass 3 days ago

enabled an automatic merge when all merge checks for d39a4994 pass
Miłosz Grocholewski merged 3 days ago

merged
Miłosz Grocholewski mentioned in commit 62c8ac0e 3 days ago

mentioned in commit 62c8ac0e

Please register or sign in to reply