You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Thibaut Girka c1c514ca70 Merge branch 'master' into glitch-soc/merge-upstream ... Manually-resolved conflicts: .circleci/config.yml app/controllers/accounts_controller.rb app/controllers/auth/passwords_controller.rb app/controllers/statuses_controller.rb app/javascript/packs/public.js app/models/media_attachment.rb app/views/stream_entries/_content_spoiler.html.haml app/views/stream_entries/_media.html.haml config/locales/en.yml config/locales/ja.yml config/locales/pl.yml lib/mastodon/version.rb Some content from app/javascript/packs/public.js has been split to app/javascript/core/settings.js. Translation strings for glitch-soc's keyword mutes were dropped. Everything else was mostly “take both”.		6 years ago
..
ar.json	Improve keyboard shortcuts descriptions (#8066)	6 years ago
ast.json	Improve keyboard shortcuts descriptions (#8066)	6 years ago
bg.json	Improve keyboard shortcuts descriptions (#8066)	6 years ago
ca.json	Improve keyboard shortcuts descriptions (#8066)	6 years ago
co.json	Improve keyboard shortcuts descriptions (#8066)	6 years ago
cs.json	Weblate translations (2018-07-30) (#8096)	6 years ago
da.json	Improve keyboard shortcuts descriptions (#8066)	6 years ago
de.json	Improve keyboard shortcuts descriptions (#8066)	6 years ago
defaultMessages.json	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
el.json	Improve keyboard shortcuts descriptions (#8066)	6 years ago
en.json	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
eo.json	Improve keyboard shortcuts descriptions (#8066)	6 years ago
es.json	Improve keyboard shortcuts descriptions (#8066)	6 years ago
eu.json	Improve keyboard shortcuts descriptions (#8066)	6 years ago
fa.json	Improve keyboard shortcuts descriptions (#8066)	6 years ago
fi.json	Improve keyboard shortcuts descriptions (#8066)	6 years ago
fr.json	Improve keyboard shortcuts descriptions (#8066)	6 years ago
gl.json	Improve keyboard shortcuts descriptions (#8066)	6 years ago
he.json	Improve keyboard shortcuts descriptions (#8066)	6 years ago
hr.json	Improve keyboard shortcuts descriptions (#8066)	6 years ago
hu.json	Improve keyboard shortcuts descriptions (#8066)	6 years ago
hy.json	Improve keyboard shortcuts descriptions (#8066)	6 years ago
id.json	Improve keyboard shortcuts descriptions (#8066)	6 years ago
index.js	…
io.json	Improve keyboard shortcuts descriptions (#8066)	6 years ago
it.json	Improve keyboard shortcuts descriptions (#8066)	6 years ago
ja.json	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
ko.json	Weblate translations (2018-07-30) (#8096)	6 years ago
nl.json	Improve keyboard shortcuts descriptions (#8066)	6 years ago
no.json	Improve keyboard shortcuts descriptions (#8066)	6 years ago
oc.json	Improve keyboard shortcuts descriptions (#8066)	6 years ago
pl.json	Merge commit 'e23b26178a71f90d64fe2a3e9e4468f265ecc71c' into glitch-soc/merge-upstream	6 years ago
pt-BR.json	Weblate translations (2018-07-30) (#8096)	6 years ago
pt.json	Improve keyboard shortcuts descriptions (#8066)	6 years ago
ru.json	Improve keyboard shortcuts descriptions (#8066)	6 years ago
sk.json	Improve keyboard shortcuts descriptions (#8066)	6 years ago
sl.json	Improve keyboard shortcuts descriptions (#8066)	6 years ago
sr-Latn.json	Improve keyboard shortcuts descriptions (#8066)	6 years ago
sr.json	Improve keyboard shortcuts descriptions (#8066)	6 years ago
sv.json	Improve keyboard shortcuts descriptions (#8066)	6 years ago
te.json	Weblate translations (2018-07-30) (#8096)	6 years ago
th.json	Improve keyboard shortcuts descriptions (#8066)	6 years ago
tr.json	Improve keyboard shortcuts descriptions (#8066)	6 years ago
uk.json	Improve keyboard shortcuts descriptions (#8066)	6 years ago
whitelist_ar.json	…
whitelist_ast.json	Weblate translations (2018-07-25) (#8065)	6 years ago
whitelist_bg.json	…
whitelist_ca.json	…
whitelist_co.json	…
whitelist_cs.json	Weblate translations (2018-07-11) (#7992)	6 years ago
whitelist_da.json	Weblate translations (2018-07-11) (#7992)	6 years ago
whitelist_de.json	…
whitelist_el.json	…
whitelist_en.json	…
whitelist_eo.json	…
whitelist_es.json	…
whitelist_eu.json	…
whitelist_fa.json	…
whitelist_fi.json	…
whitelist_fr.json	…
whitelist_gl.json	…
whitelist_he.json	…
whitelist_hr.json	…
whitelist_hu.json	…
whitelist_hy.json	…
whitelist_id.json	…
whitelist_io.json	…
whitelist_it.json	…
whitelist_ja.json	…
whitelist_ko.json	…
whitelist_nl.json	…
whitelist_no.json	…
whitelist_oc.json	…
whitelist_pl.json	…
whitelist_pt-BR.json	…
whitelist_pt.json	…
whitelist_ru.json	…
whitelist_sk.json	…
whitelist_sl.json	…
whitelist_sr-Latn.json	…
whitelist_sr.json	…
whitelist_sv.json	…
whitelist_te.json	…
whitelist_th.json	…
whitelist_tr.json	…
whitelist_uk.json	…
whitelist_zh-CN.json	…
whitelist_zh-HK.json	…
whitelist_zh-TW.json	…
zh-CN.json	Improve keyboard shortcuts descriptions (#8066)	6 years ago
zh-HK.json	Improve keyboard shortcuts descriptions (#8066)	6 years ago
zh-TW.json	Improve keyboard shortcuts descriptions (#8066)	6 years ago