Code

Upstream merge#27

Code

Closed

nplasterer wants to merge 10 commits intomainxmtp/openmls:mainfrom np/clean-upstream-mergexmtp/openmls:np/clean-upstream-mergeCopy head branch name to clipboard

+103-15

Commits

Commits on May 9, 2024

• make storage id public

  nplasterer

  committed
  f74176f

• Merge pull request openmls#1576 from nplasterer/np/make-storage-id-pub

  Show description for 45a3d3a
  franziskuskiefer

  authored
  45a3d3a

Commits on May 10, 2024

• Return an empty vector in storage.aad when it's not found (openmls#1577)

  franziskuskiefer

  authored
  25207a2

• Remove PartialEq requirement from associated Error type (openmls#1578)

  kkohbrok

  authored
  daa00c6

• update storage proposal api (openmls#1579)

  Show description for b7035fa
  franziskuskiefer

  authored
  b7035fa

Commits on May 16, 2024

• bad merge conflicts from upstream

  nplasterer

  committed
  c2abb1d

• Merge remote-tracking branch 'upstream/main' into np/clean-upstream-merge

  nplasterer

  committed
  d3aa3cc

• more bad merge items

  nplasterer

  committed
  e174158

• undo that change

  nplasterer

  committed
  4e4643b

• undo a bunch of changes

  nplasterer

  committed
  b5d91f9