therwi/sunkkoma
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'develop' into 'feat/conversation-muting'

Browse source 
# Conflicts:
#   src/components/extra_buttons/extra_buttons.js
#   src/components/extra_buttons/extra_buttons.vue
This commit is contained in:
Shpuld Shpludson 2019-07-26 12:44:32 +00:00
commit d3f6b581d1
28 changed files with 638 additions and 177 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/i18n/en.json
View file

@ -106,6 +106,9 @@
"expired": "Poll ended {0} ago",
"not_enough_options": "Too few unique options in poll"
},
"stickers": {
"add_sticker": "Add Sticker"
},
"interactions": {
"favs_repeats": "Repeats and Favorites",
"follows": "New follows",