diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index a696bc5ce..2e0db1938 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -26,8 +26,10 @@ Also, when you start implementation, assign yourself to the Issue (if you cannot ## Well-known branches - **`master`** branch is tracking the latest release and used for production purposes. -- **`develop`** branch is where we work for the next release. +- **`honi-dev`** branch is where we work for the next release. - When you create a PR, basically target it to this branch. +- **`develop`** branch is where original misskey team work for the next release. + - You **must not** target your PR to this branch. - **`l10n_develop`** branch is reserved for localization management. ## Creating a PR diff --git a/packages/client/src/widgets/calendar.vue b/packages/client/src/widgets/calendar.vue index c6a69b3fb..e0b82bb13 100644 --- a/packages/client/src/widgets/calendar.vue +++ b/packages/client/src/widgets/calendar.vue @@ -76,8 +76,13 @@ const tick = () => { const ny = now.getFullYear(); year.value = ny; - month.value = nm + 1; - day.value = nd; + if (nd === 1 && nm + 1 === 4) { // エイプリルフール + month.value = 3; + day.value = 32; + } else { // 通常 + month.value = nm + 1; + day.value = nd; + } weekDay.value = [ i18n.ts._weekday.sunday, i18n.ts._weekday.monday,