Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge remote-tracking branch 'merkl-app/main' #4

Merged
merged 3 commits into from
Jan 6, 2025
Merged

Conversation

hugolxt
Copy link

@hugolxt hugolxt commented Jan 6, 2025

No description provided.

@Picodes Picodes merged commit 85e15ff into main Jan 6, 2025
1 check passed
@Picodes Picodes deleted the sync/merkl-app branch January 6, 2025 10:59
hugolxt pushed a commit that referenced this pull request Jan 7, 2025
* add: theme selector when in dev mode

* add: theme switcher in dev mode

* fix: protocol empty tag

* fix: lint error
clmntsnr pushed a commit that referenced this pull request Jan 7, 2025
* Merge remote-tracking branch 'merkl-app/main'

* update dappkit

* lint
clmntsnr pushed a commit that referenced this pull request Jan 7, 2025
* Merge remote-tracking branch 'merkl-app/main'

* update dappkit

* lint
clmntsnr pushed a commit that referenced this pull request Jan 7, 2025
* Merge remote-tracking branch 'merkl-app/main'

* update dappkit

* lint
clmntsnr added a commit that referenced this pull request Jan 7, 2025
* Sync Merkl-app (AngleProtocol#55)

* Sync Merkl-app

* lint

* Sync/rebased (AngleProtocol#57)

* Fork rebasing

* chore: update @merkl/api version and refactor various components and services

* Puffer Branding (#3)

* chore: update app

* fix: lint

* Merge remote-tracking branch 'merkl-app/main' (#4)

* Merge remote-tracking branch 'merkl-app/main'

* update dappkit

* lint

* update config for puffer (#5)

* clean hero

* update: config

* revert

* restore

---------

Co-authored-by: hugolxt <87241914+hugolxt@users.noreply.github.com>
Co-authored-by: Viande <33333630+indaviande@users.noreply.github.com>
Co-authored-by: picodes <picodes@angle.money>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants