Thibaut Girka c0dc247bce Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/models/account.rb - app/views/settings/profiles/show.html.haml - spec/controllers/api/v1/accounts/credentials_controller_spec.rb Conflicts were due to an increase in account bio length upstream, which is already covered in glitch-soc through `MAX_BIO_CHARS`.		2019-05-23 19:01:30 +02:00
..
locale-data	[i18n] update and corrections for Occitan locale (#9404)	2018-12-01 17:39:13 +01:00
ar.json	i18n: Complete frontend Bengali translation (#10800)	2019-05-22 10:00:58 +09:00
ast.json	i18n: Complete frontend Bengali translation (#10800)	2019-05-22 10:00:58 +09:00
bg.json	i18n: Complete frontend Bengali translation (#10800)	2019-05-22 10:00:58 +09:00
bn.json	i18n: Complete frontend Bengali translation (#10800)	2019-05-22 10:00:58 +09:00
ca.json	i18n Update Catalan translation (#10719)	2019-05-07 00:55:37 +09:00
co.json	i18n: Update Corsican translations (#10746)	2019-05-10 18:09:34 +02:00
cs.json	i18n: Complete frontend Bengali translation (#10800)	2019-05-22 10:00:58 +09:00
cy.json	i18n: Complete frontend Bengali translation (#10800)	2019-05-22 10:00:58 +09:00
da.json	i18n: Complete frontend Bengali translation (#10800)	2019-05-22 10:00:58 +09:00
de.json	i18n: Complete frontend Bengali translation (#10800)	2019-05-22 10:00:58 +09:00
defaultMessages.json	Merge branch 'master' into glitch-soc/merge-upstream	2019-05-23 19:01:30 +02:00
el.json	i18n: Complete frontend Bengali translation (#10800)	2019-05-22 10:00:58 +09:00
en.json	Merge branch 'master' into glitch-soc/merge-upstream	2019-05-10 17:09:12 +02:00
eo.json	i18n: Complete frontend Bengali translation (#10800)	2019-05-22 10:00:58 +09:00
es.json	i18n: Complete frontend Bengali translation (#10800)	2019-05-22 10:00:58 +09:00
eu.json	i18n: Complete frontend Bengali translation (#10800)	2019-05-22 10:00:58 +09:00
fa.json	i18n: Complete frontend Bengali translation (#10800)	2019-05-22 10:00:58 +09:00
fi.json	i18n: Complete frontend Bengali translation (#10800)	2019-05-22 10:00:58 +09:00
fr.json	i18n: Update French translations (#10747)	2019-05-10 18:09:46 +02:00
gl.json	i18n: Complete frontend Bengali translation (#10800)	2019-05-22 10:00:58 +09:00
he.json	i18n: Complete frontend Bengali translation (#10800)	2019-05-22 10:00:58 +09:00
hi.json	i18n: Complete frontend Bengali translation (#10800)	2019-05-22 10:00:58 +09:00
hr.json	i18n: Complete frontend Bengali translation (#10800)	2019-05-22 10:00:58 +09:00
hu.json	i18n: Complete frontend Bengali translation (#10800)	2019-05-22 10:00:58 +09:00
hy.json	i18n: Complete frontend Bengali translation (#10800)	2019-05-22 10:00:58 +09:00
id.json	i18n: Complete frontend Bengali translation (#10800)	2019-05-22 10:00:58 +09:00
index.js	Finalized theme loading and stuff	2017-11-20 22:13:37 -08:00
io.json	i18n: Complete frontend Bengali translation (#10800)	2019-05-22 10:00:58 +09:00
it.json	i18n: Complete frontend Bengali translation (#10800)	2019-05-22 10:00:58 +09:00
ja.json	Merge branch 'master' into glitch-soc/merge-upstream	2019-05-10 17:09:12 +02:00
ka.json	i18n: Complete frontend Bengali translation (#10800)	2019-05-22 10:00:58 +09:00
kk.json	i18n: Complete frontend Bengali translation (#10800)	2019-05-22 10:00:58 +09:00
ko.json	i18n: Complete frontend Bengali translation (#10800)	2019-05-22 10:00:58 +09:00
lv.json	i18n: Complete frontend Bengali translation (#10800)	2019-05-22 10:00:58 +09:00
ms.json	i18n: Complete frontend Bengali translation (#10800)	2019-05-22 10:00:58 +09:00
nl.json	i18n: Complete frontend Bengali translation (#10800)	2019-05-22 10:00:58 +09:00
no.json	i18n: Complete frontend Bengali translation (#10800)	2019-05-22 10:00:58 +09:00
oc.json	i18n: Complete frontend Bengali translation (#10800)	2019-05-22 10:00:58 +09:00
pl.json	Merge branch 'master' into glitch-soc/merge-upstream	2019-05-23 19:01:30 +02:00
pt-BR.json	i18n: Complete frontend Bengali translation (#10800)	2019-05-22 10:00:58 +09:00
pt.json	i18n: Complete frontend Bengali translation (#10800)	2019-05-22 10:00:58 +09:00
ro.json	i18n: Complete frontend Bengali translation (#10800)	2019-05-22 10:00:58 +09:00
ru.json	i18n: Complete frontend Bengali translation (#10800)	2019-05-22 10:00:58 +09:00
sk.json	i18n: Complete frontend Bengali translation (#10800)	2019-05-22 10:00:58 +09:00
sl.json	i18n: Complete frontend Bengali translation (#10800)	2019-05-22 10:00:58 +09:00
sq.json	i18n: Complete frontend Bengali translation (#10800)	2019-05-22 10:00:58 +09:00
sr-Latn.json	i18n: Complete frontend Bengali translation (#10800)	2019-05-22 10:00:58 +09:00
sr.json	i18n: Complete frontend Bengali translation (#10800)	2019-05-22 10:00:58 +09:00
sv.json	i18n: Complete frontend Bengali translation (#10800)	2019-05-22 10:00:58 +09:00
ta.json	i18n: Complete frontend Bengali translation (#10800)	2019-05-22 10:00:58 +09:00
te.json	i18n: Complete frontend Bengali translation (#10800)	2019-05-22 10:00:58 +09:00
th.json	i18n: Complete frontend Bengali translation (#10800)	2019-05-22 10:00:58 +09:00
tr.json	i18n: Complete frontend Bengali translation (#10800)	2019-05-22 10:00:58 +09:00
uk.json	i18n: Complete frontend Bengali translation (#10800)	2019-05-22 10:00:58 +09:00
whitelist_ar.json	Add final newline to locale files (#2890)	2017-05-07 19:55:47 +02:00
whitelist_ast.json	Weblate translations (2018-07-25) (#8065)	2018-07-24 20:47:13 +02:00
whitelist_bg.json	Add final newline to locale files (#2890)	2017-05-07 19:55:47 +02:00
whitelist_bn.json	Weblate translations (2019-03-24) (#10362)	2019-03-24 18:44:59 +01:00
whitelist_ca.json	Fix minor Japanese translations (#3099)	2017-05-17 17:50:39 +02:00
whitelist_co.json	Add Corsican localization (#7390)	2018-05-07 01:34:19 +02:00
whitelist_cs.json	Weblate translations (2018-07-11) (#7992)	2018-07-11 01:14:38 +02:00
whitelist_cy.json	Weblate translations (2018-08-31) (#8535)	2018-08-31 04:28:29 +02:00
whitelist_da.json	Weblate translations (2018-07-11) (#7992)	2018-07-11 01:14:38 +02:00
whitelist_de.json	Add final newline to locale files (#2890)	2017-05-07 19:55:47 +02:00
whitelist_el.json	Add el and te (#7332)	2018-05-03 15:54:10 +02:00
whitelist_en.json	Add final newline to locale files (#2890)	2017-05-07 19:55:47 +02:00
whitelist_eo.json	Add final newline to locale files (#2890)	2017-05-07 19:55:47 +02:00
whitelist_es.json	Add final newline to locale files (#2890)	2017-05-07 19:55:47 +02:00
whitelist_eu.json	Add el and te (#7332)	2018-05-03 15:54:10 +02:00
whitelist_fa.json	Add final newline to locale files (#2890)	2017-05-07 19:55:47 +02:00
whitelist_fi.json	Add final newline to locale files (#2890)	2017-05-07 19:55:47 +02:00
whitelist_fr.json	Add final newline to locale files (#2890)	2017-05-07 19:55:47 +02:00
whitelist_gl.json	Weblate translations (#5946)	2017-12-09 15:35:22 +01:00
whitelist_he.json	Add final newline to locale files (#2890)	2017-05-07 19:55:47 +02:00
whitelist_hi.json	Add hi.json (#10573)	2019-04-21 04:52:20 +02:00
whitelist_hr.json	Add final newline to locale files (#2890)	2017-05-07 19:55:47 +02:00
whitelist_hu.json	Add final newline to locale files (#2890)	2017-05-07 19:55:47 +02:00
whitelist_hy.json	Weblate translations (#6323)	2018-01-22 14:20:58 +01:00
whitelist_id.json	Add final newline to locale files (#2890)	2017-05-07 19:55:47 +02:00
whitelist_io.json	Add final newline to locale files (#2890)	2017-05-07 19:55:47 +02:00
whitelist_it.json	Add final newline to locale files (#2890)	2017-05-07 19:55:47 +02:00
whitelist_ja.json	Simplify getting started links localization. Link "powered by Mastodon" to joinmastodon.org (#3725)	2017-06-13 03:55:28 +02:00
whitelist_ka.json	Add Georgian language translation (#8250)	2018-08-18 01:00:01 +09:00
whitelist_kk.json	Weblate translations (2019-02-23) (#10103)	2019-02-23 18:41:28 +01:00
whitelist_ko.json	i18n: Add korean translation (#4064)	2017-07-04 16:11:23 +02:00
whitelist_lv.json	Weblate translations (2019-01-08) (#9758)	2019-01-08 14:09:57 +01:00
whitelist_ms.json	Remove links to bridge.joinmastodon.org (non-functional) (#9608)	2018-12-22 23:32:00 +01:00
whitelist_nl.json	Add final newline to locale files (#2890)	2017-05-07 19:55:47 +02:00
whitelist_no.json	Add final newline to locale files (#2890)	2017-05-07 19:55:47 +02:00
whitelist_oc.json	Add final newline to locale files (#2890)	2017-05-07 19:55:47 +02:00
whitelist_pl.json	Add final newline to locale files (#2890)	2017-05-07 19:55:47 +02:00
whitelist_pt-BR.json	Add final newline to locale files (#2890)	2017-05-07 19:55:47 +02:00
whitelist_pt.json	Add final newline to locale files (#2890)	2017-05-07 19:55:47 +02:00
whitelist_ro.json	Weblate translations (2018-09-01) (#8561)	2018-09-02 03:14:46 +02:00
whitelist_ru.json	Add final newline to locale files (#2890)	2017-05-07 19:55:47 +02:00
whitelist_sk.json	Add Japanese translations #5997, #6003, #6004, #6071, #6099, #6125 and #6132 (#6167)	2018-01-03 21:00:39 +09:00
whitelist_sl.json	Weblate translations (2018-05-10) (#7438)	2018-05-10 14:48:26 +02:00
whitelist_sq.json	Weblate translations (2019-02-11) (#10007)	2019-02-11 07:41:35 +01:00
whitelist_sr-Latn.json	Fix RFC 5646 Regular Expression (#6190)	2018-01-05 04:43:50 +01:00
whitelist_sr.json	Add Japanese translations #5997, #6003, #6004, #6071, #6099, #6125 and #6132 (#6167)	2018-01-03 21:00:39 +09:00
whitelist_sv.json	Add Japanese translations (#5810)	2017-11-25 03:39:57 +01:00
whitelist_ta.json	Weblate translations (2018-09-02) (#8577)	2018-09-02 18:20:26 +02:00
whitelist_te.json	Add el and te (#7332)	2018-05-03 15:54:10 +02:00
whitelist_th.json	Add th.json. (#3588)	2017-06-05 17:02:41 +02:00
whitelist_tr.json	Fix duplicated values in nl.json (#2931)	2017-05-09 14:12:35 +02:00
whitelist_uk.json	Add final newline to locale files (#2890)	2017-05-07 19:55:47 +02:00
whitelist_zh-CN.json	Add final newline to locale files (#2890)	2017-05-07 19:55:47 +02:00
whitelist_zh-HK.json	Fix regular expression for RFC 5646 (regression from #3604) (#4133)	2017-07-10 14:02:18 +02:00
whitelist_zh-TW.json	Add zh-TW.json (#3459)	2017-05-30 23:09:02 +02:00
zh-CN.json	i18n: Complete frontend Bengali translation (#10800)	2019-05-22 10:00:58 +09:00
zh-HK.json	i18n: Complete frontend Bengali translation (#10800)	2019-05-22 10:00:58 +09:00
zh-TW.json	i18n: Complete frontend Bengali translation (#10800)	2019-05-22 10:00:58 +09:00