Code

chore: resolve conflicts#64

Code

Merged

0xArdy merged 10 commits intodevdefi-wonderland/web:devfrom chore/resolve-conflictsdefi-wonderland/web:chore/resolve-conflictsCopy head branch name to clipboardNov 22, 2023

Commits

Commits on Sep 18, 2023

• Merge branch 'main' of github-defi:defi-wonderland/web-private into dev

  0xArdy

  committed
  05f7ead

  Copy full SHA for 05f7ead

Commits on Sep 21, 2023

• Merge branch 'dev' of github-defi:defi-wonderland/web-private into dev

  0xArdy

  committed
  35674ee

  Copy full SHA for 35674ee

Commits on Sep 22, 2023

• Merge branch 'dev' of github-defi:defi-wonderland/web-private into dev

  0xArdy

  committed
  2a9584b

  Copy full SHA for 2a9584b

Commits on Nov 3, 2023

• Merge branch 'dev' of github-defi:defi-wonderland/web-private into dev

  0xArdy

  committed
  fe9fd29

  Copy full SHA for fe9fd29

Commits on Nov 17, 2023

• Merge branch 'dev' of github-defi:defi-wonderland/web into dev

  0xArdy

  committed
  3e62804

  Copy full SHA for 3e62804

Commits on Nov 20, 2023

• feat: liveness blog (#59)

  Show description for f023cd8
  

  0xGorilla

  and

  0xArdy

  authored
  f023cd8

  Copy full SHA for f023cd8

Commits on Nov 21, 2023

• Merge branch 'dev' of github-defi:defi-wonderland/web into dev

  0xArdy

  committed
  3a95ff2

  Copy full SHA for 3a95ff2

• feat: liveness blog post and enti to squad (#61)

  Show description for 70b8e6c
  

  3 peopleauthored
  70b8e6c

  Copy full SHA for 70b8e6c

Commits on Nov 22, 2023

• Merge branch 'main' of github-defi:defi-wonderland/web into dev

  0xArdy

  committed
  e9cf1ea

  Copy full SHA for e9cf1ea

• Merge branch 'dev' of github-defi:defi-wonderland/web into dev

  0xArdy

  committed
  70ffc24

  Copy full SHA for 70ffc24