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 034ffc079e Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/controllers/admin/base_controller.rb Some refactoring made upstream, no real conflict. - app/javascript/mastodon/features/compose/components/compose_form.js Updated using upstream's code but using maxChars instead of the hardcoded length of 500 characters per toot. - app/javascript/styles/mastodon/components.scss Upstream redesigned the onboarding modal. Not sure why we had a conflict there.		6 years ago
..
locale-data	[i18n] update and corrections for Occitan locale (#9404)	6 years ago
ar.json	Weblate translations (2018-12-13) (#9513)	6 years ago
ast.json	Weblate translations (2018-12-13) (#9513)	6 years ago
bg.json	[i18n] Update Occitan (#9491)	6 years ago
ca.json	Weblate translations (2018-12-13) (#9513)	6 years ago
co.json	Weblate translations (2018-12-13) (#9513)	6 years ago
cs.json	Weblate translations (2018-12-13) (#9513)	6 years ago
cy.json	[i18n] Update Occitan (#9491)	6 years ago
da.json	Weblate translations (2018-12-13) (#9513)	6 years ago
de.json	Weblate translations (2018-12-13) (#9513)	6 years ago
defaultMessages.json	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
el.json	Weblate translations (2018-12-13) (#9513)	6 years ago
en.json	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
eo.json	Weblate translations (2018-12-13) (#9513)	6 years ago
es.json	[i18n] Update Occitan (#9491)	6 years ago
eu.json	Weblate translations (2018-12-13) (#9513)	6 years ago
fa.json	[i18n] Update Occitan (#9491)	6 years ago
fi.json	[i18n] Update Occitan (#9491)	6 years ago
fr.json	Weblate translations (2018-12-13) (#9513)	6 years ago
gl.json	Weblate translations (2018-12-13) (#9513)	6 years ago
he.json	[i18n] Update Occitan (#9491)	6 years ago
hr.json	[i18n] Update Occitan (#9491)	6 years ago
hu.json	[i18n] Update Occitan (#9491)	6 years ago
hy.json	[i18n] Update Occitan (#9491)	6 years ago
id.json	[i18n] Update Occitan (#9491)	6 years ago
index.js	…
io.json	[i18n] Update Occitan (#9491)	6 years ago
it.json	Weblate translations (2018-12-13) (#9513)	6 years ago
ja.json	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
ka.json	[i18n] Update Occitan (#9491)	6 years ago
ko.json	[i18n] Update Occitan (#9491)	6 years ago
ms.json	[i18n] Update Occitan (#9491)	6 years ago
nl.json	Weblate translations (2018-12-13) (#9513)	6 years ago
no.json	[i18n] Update Occitan (#9491)	6 years ago
oc.json	[i18n] Update Occitan (#9491)	6 years ago
pl.json	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
pt-BR.json	Weblate translations (2018-12-13) (#9513)	6 years ago
pt.json	[i18n] Update Occitan (#9491)	6 years ago
ro.json	[i18n] Update Occitan (#9491)	6 years ago
ru.json	[i18n] Update Occitan (#9491)	6 years ago
sk.json	Weblate translations (2018-12-13) (#9513)	6 years ago
sl.json	[i18n] Update Occitan (#9491)	6 years ago
sr-Latn.json	[i18n] Update Occitan (#9491)	6 years ago
sr.json	[i18n] Update Occitan (#9491)	6 years ago
sv.json	[i18n] Update Occitan (#9491)	6 years ago
ta.json	[i18n] Update Occitan (#9491)	6 years ago
te.json	[i18n] Update Occitan (#9491)	6 years ago
th.json	[i18n] Update Occitan (#9491)	6 years ago
tr.json	[i18n] Update Occitan (#9491)	6 years ago
uk.json	[i18n] Update Occitan (#9491)	6 years ago
whitelist_ar.json	…
whitelist_ast.json	…
whitelist_bg.json	…
whitelist_ca.json	…
whitelist_co.json	…
whitelist_cs.json	…
whitelist_cy.json	…
whitelist_da.json	…
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_ka.json	…
whitelist_ko.json	…
whitelist_nl.json	…
whitelist_no.json	…
whitelist_oc.json	…
whitelist_pl.json	…
whitelist_pt-BR.json	…
whitelist_pt.json	…
whitelist_ro.json	…
whitelist_ru.json	…
whitelist_sk.json	…
whitelist_sl.json	…
whitelist_sr-Latn.json	…
whitelist_sr.json	…
whitelist_sv.json	…
whitelist_ta.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	[i18n] Update Occitan (#9491)	6 years ago
zh-HK.json	[i18n] Update Occitan (#9491)	6 years ago
zh-TW.json	[i18n] Update Occitan (#9491)	6 years ago