Merge remote-tracking branch 'misskey-mattyatea/emoji-request' into develop
# Conflicts: # locales/index.d.ts # locales/ja-JP.yml # packages/backend/src/core/UserFollowingService.ts # packages/frontend/src/components/MkEmojiPicker.vue # packages/frontend/src/pages/custom-emojis-manager.vue
This commit is contained in:
commit
c7c70c1c30
36 changed files with 1089 additions and 421 deletions
|
|
@ -67,6 +67,7 @@ export const ROLE_POLICIES = [
|
|||
'inviteLimitCycle',
|
||||
'inviteExpirationTime',
|
||||
'canManageCustomEmojis',
|
||||
'canRequestCustomEmojis',
|
||||
'canSearchNotes',
|
||||
'canUseTranslator',
|
||||
'canHideAds',
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue