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 upstream 17 #170

Merged
merged 5 commits into from
Dec 16, 2024
Merged

Merge upstream 17 #170

merged 5 commits into from
Dec 16, 2024

Conversation

kakkokari-gtyih
Copy link

What

Why

Additional info (optional)

squashなし

Checklist

  • Read the contribution guide
  • Test working in a local environment
  • (If needed) Add story of storybook
  • (If needed) Update CHANGELOG.md
  • (If possible) Add tests

FineArchs and others added 5 commits December 16, 2024 08:55
* チャンネル一覧の列を最大3列にした (Otaku-Social#13)

* fix

* fix

* fix

* 🎨

* fix

* 🎨

* Update Changelog

* Update Changelog

* 要らない_marginを消す

---------

Co-authored-by: tmorio <[email protected]>
* fix(frontend): 絵文字管理画面で絵文字が表示されないことがある問題を修正

* Update Changelog

* optimize
* fix(frontend): serverContextの型エラーを修正

* add comment
@kanarikanaru kanarikanaru merged commit 0be8273 into hanami Dec 16, 2024
24 checks passed
@kanarikanaru kanarikanaru deleted the merge-upstream-17 branch December 16, 2024 15:25
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.

3 participants