Code

Show conflicts in entity feed#892

Code

Merged

matthew-white merged 4 commits intomastergetodk/central-frontend:masterfrom entity-feed-conflictsgetodk/central-frontend:entity-feed-conflictsCopy head branch name to clipboardNov 21, 2023

+1,169-81

Commits

Commits on Nov 20, 2023

• Show conflicts in entity feed

  Show description for ab4155a
  matthew-white

  committed
  ab4155a

Commits on Nov 21, 2023

• Make small changes after code review

  matthew-white

  committed
  4195c46

• Merge branch 'master' into entity-feed-conflicts

  matthew-white

  committed
  f6be337

• More small changes

  matthew-white

  committed
  968b888