Thibaut Girka 249991c498 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - Gemfile.lock - app/controllers/accounts_controller.rb - app/controllers/admin/dashboard_controller.rb - app/controllers/follower_accounts_controller.rb - app/controllers/following_accounts_controller.rb - app/controllers/remote_follow_controller.rb - app/controllers/stream_entries_controller.rb - app/controllers/tags_controller.rb - app/javascript/packs/public.js - app/lib/sanitize_config.rb - app/models/account.rb - app/models/form/admin_settings.rb - app/models/media_attachment.rb - app/models/stream_entry.rb - app/models/user.rb - app/serializers/initial_state_serializer.rb - app/services/batched_remove_status_service.rb - app/services/post_status_service.rb - app/services/process_mentions_service.rb - app/services/reblog_service.rb - app/services/remove_status_service.rb - app/views/admin/settings/edit.html.haml - config/locales/simple_form.pl.yml - config/settings.yml - docker-compose.yml		2019-07-19 18:26:49 +02:00
..
locale-data	[i18n] update and corrections for Occitan locale (#9404)	2018-12-01 17:39:13 +01:00
ar.json	New Crowdin translations (#11153)	2019-07-15 06:12:05 +02:00
ast.json	New Crowdin translations (#11153)	2019-07-15 06:12:05 +02:00
bg.json	New Crowdin translations (#11153)	2019-07-15 06:12:05 +02:00
bn.json	New Crowdin translations (#11153)	2019-07-15 06:12:05 +02:00
ca.json	New Crowdin translations (#11153)	2019-07-15 06:12:05 +02:00
co.json	New Crowdin translations (#11153)	2019-07-15 06:12:05 +02:00
cs.json	New Crowdin translations (#11153)	2019-07-15 06:12:05 +02:00
cy.json	New Crowdin translations (#11153)	2019-07-15 06:12:05 +02:00
da.json	New Crowdin translations (#11153)	2019-07-15 06:12:05 +02:00
de.json	New Crowdin translations (#11153)	2019-07-15 06:12:05 +02:00
defaultMessages.json	Merge branch 'master' into glitch-soc/merge-upstream	2019-07-19 18:26:49 +02:00
el.json	New Crowdin translations (#11153)	2019-07-15 06:12:05 +02:00
en.json	Merge branch 'master' into glitch-soc/merge-upstream	2019-07-19 18:26:49 +02:00
eo.json	New Crowdin translations (#11153)	2019-07-15 06:12:05 +02:00
es.json	New Crowdin translations (#11153)	2019-07-15 06:12:05 +02:00
eu.json	New Crowdin translations (#11153)	2019-07-15 06:12:05 +02:00
fa.json	New Crowdin translations (#11153)	2019-07-15 06:12:05 +02:00
fi.json	New Crowdin translations (#11153)	2019-07-15 06:12:05 +02:00
fr.json	New Crowdin translations (#11153)	2019-07-15 06:12:05 +02:00
gl.json	New Crowdin translations (#11153)	2019-07-15 06:12:05 +02:00
he.json	New Crowdin translations (#11153)	2019-07-15 06:12:05 +02:00
hi.json	New Crowdin translations (#11153)	2019-07-15 06:12:05 +02:00
hr.json	New Crowdin translations (#11153)	2019-07-15 06:12:05 +02:00
hu.json	New Crowdin translations (#11153)	2019-07-15 06:12:05 +02:00
hy.json	New Crowdin translations (#11153)	2019-07-15 06:12:05 +02:00
id.json	New Crowdin translations (#11153)	2019-07-15 06:12:05 +02:00
index.js	…
io.json	New Crowdin translations (#11153)	2019-07-15 06:12:05 +02:00
it.json	New Crowdin translations (#11153)	2019-07-15 06:12:05 +02:00
ja.json	Merge branch 'master' into glitch-soc/merge-upstream	2019-07-19 18:26:49 +02:00
ka.json	New Crowdin translations (#11153)	2019-07-15 06:12:05 +02:00
kk.json	New Crowdin translations (#11153)	2019-07-15 06:12:05 +02:00
ko.json	New Crowdin translations (#11153)	2019-07-15 06:12:05 +02:00
lt.json	New Crowdin translations (#11153)	2019-07-15 06:12:05 +02:00
lv.json	New Crowdin translations (#11153)	2019-07-15 06:12:05 +02:00
ms.json	New Crowdin translations (#11153)	2019-07-15 06:12:05 +02:00
nl.json	New Crowdin translations (#11153)	2019-07-15 06:12:05 +02:00
no.json	New Crowdin translations (#11153)	2019-07-15 06:12:05 +02:00
oc.json	New Crowdin translations (#11153)	2019-07-15 06:12:05 +02:00
pl.json	Merge branch 'master' into glitch-soc/merge-upstream	2019-07-19 18:26:49 +02:00
pt-BR.json	New Crowdin translations (#11153)	2019-07-15 06:12:05 +02:00
pt.json	New Crowdin translations (#11153)	2019-07-15 06:12:05 +02:00
ro.json	New Crowdin translations (#11153)	2019-07-15 06:12:05 +02:00
ru.json	New Crowdin translations (#11153)	2019-07-15 06:12:05 +02:00
sk.json	New Crowdin translations (#11153)	2019-07-15 06:12:05 +02:00
sl.json	New Crowdin translations (#11153)	2019-07-15 06:12:05 +02:00
sq.json	New Crowdin translations (#11153)	2019-07-15 06:12:05 +02:00
sr-Latn.json	New Crowdin translations (#11153)	2019-07-15 06:12:05 +02:00
sr.json	New Crowdin translations (#11153)	2019-07-15 06:12:05 +02:00
sv.json	New Crowdin translations (#11153)	2019-07-15 06:12:05 +02:00
ta.json	New Crowdin translations (#11153)	2019-07-15 06:12:05 +02:00
te.json	New Crowdin translations (#11153)	2019-07-15 06:12:05 +02:00
th.json	New Crowdin translations (#11153)	2019-07-15 06:12:05 +02:00
tr.json	New Crowdin translations (#11153)	2019-07-15 06:12:05 +02:00
uk.json	New Crowdin translations (#11153)	2019-07-15 06:12:05 +02:00
whitelist_ar.json	…
whitelist_ast.json	…
whitelist_bg.json	…
whitelist_bn.json	Weblate translations (2019-03-24) (#10362)	2019-03-24 18:44:59 +01:00
whitelist_ca.json	…
whitelist_co.json	…
whitelist_cs.json	…
whitelist_cy.json	…
whitelist_da.json	…
whitelist_de.json	Add German translations (#11043)	2019-06-10 21:36:20 +02:00
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_hi.json	Add hi.json (#10573)	2019-04-21 04:52:20 +02:00
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_kk.json	Weblate translations (2019-02-23) (#10103)	2019-02-23 18:41:28 +01:00
whitelist_ko.json	…
whitelist_lt.json	New Crowdin translations (#11060)	2019-06-12 15:56:18 +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	…
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_sq.json	Weblate translations (2019-02-11) (#10007)	2019-02-11 07:41:35 +01:00
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	New Crowdin translations (#11153)	2019-07-15 06:12:05 +02:00
zh-HK.json	New Crowdin translations (#11153)	2019-07-15 06:12:05 +02:00
zh-TW.json	New Crowdin translations (#11153)	2019-07-15 06:12:05 +02:00