Code

add option to merge settings#3464

Code

Merged

thebrianchen merged 13 commits intomasterfirebase/firebase-js-sdk:masterfrom

bc/merge-settingsfirebase/firebase-js-sdk:bc/merge-settingsCopy head branch name to clipboard

Aug 19, 2020

Commits

Commits on Jul 23, 2020

• add option to merge settings

  

  Brian Chen

  committed
  6b80d73

  Copy full SHA for 6b80d73

• add changeset

  

  Brian Chen

  committed
  d1815db

  Copy full SHA for d1815db

Commits on Jul 24, 2020

• lint

  

  Brian Chen

  committed
  86b46e0

  Copy full SHA for 86b46e0

• Merge branch 'master' into bc/merge-settings

  

  Brian Chen

  committed
  f2c0aa7

  Copy full SHA for f2c0aa7

• use new firestore for tests

  

  Brian Chen

  committed
  bbcdf2f

  Copy full SHA for bbcdf2f

Commits on Jul 27, 2020

• resolve comments

  

  Brian Chen

  committed
  1922a36

  Copy full SHA for 1922a36

• update changeset

  

  Brian Chen

  committed
  920d050

  Copy full SHA for 920d050

Commits on Jul 29, 2020

• Merge branch 'master' into bc/merge-settings

  

  Brian Chen

  committed
  1832824

  Copy full SHA for 1832824

Commits on Aug 4, 2020

• update provider

  

  Brian Chen

  committed
  727ec62

  Copy full SHA for 727ec62

• Merge branch 'master' into bc/merge-settings

  

  Brian Chen

  committed
  f97b6c2

  Copy full SHA for f97b6c2

Commits on Aug 13, 2020

• fix comments and change name to merge

  

  Brian Chen

  committed
  1a7a1cd

  Copy full SHA for 1a7a1cd

• Merge branch 'master' into bc/merge-settings

  

  Brian Chen

  committed
  a25cce6

  Copy full SHA for a25cce6

Commits on Aug 19, 2020

• Merge branch 'master' into bc/merge-settings

  

  Brian Chen

  committed
  e9f508b

  Copy full SHA for e9f508b