Commit 10bb22b5 authored by Shpuld Shpludson's avatar Shpuld Shpludson

Merge branch 'feature/japanese-translation' into 'develop'

Use kana+kanji as default for Japanese translation

See merge request pleroma/pleroma-fe!1001
parents 748e9c52 67c95c9d
Pipeline #20164 passed with stages
in 4 minutes and 27 seconds