Skip to content
Snippets Groups Projects

Unification merge conflict

Closed Marek Szuba requested to merge unified-unification into master

Created by: tgrego

Do not merge!

This branch is a merge of master and feature/unified-design branches, that have diverged... Apparently both branches are used in different places, so the merge has to be correct for master to become the only branch used.

Some minor fixes added.

Merge request reports

Loading
Loading

Activity

Filter activity
  • Approvals
  • Assignees & reviewers
  • Comments (from bots)
  • Comments (from users)
  • Commits & branches
  • Edits
  • Labels
  • Lock status
  • Mentions
  • Merge request status
  • Tracking
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
Please register or sign in to reply