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 d392020da6 Merge branch 'master' into glitch-soc/tentative-merge ... Conflicts: README.md app/controllers/statuses_controller.rb app/lib/feed_manager.rb config/navigation.rb spec/lib/feed_manager_spec.rb Conflicts were resolved by taking both versions for each change. This means the two filter systems (glitch-soc's keyword mutes and tootsuite's custom filters) are in place, which will be changed in a follow-up commit.		7 years ago
..
ar.json	Weblate translations (2018-07-05) (#7950)	7 years ago
bg.json	Weblate translations (2018-07-05) (#7950)	7 years ago
ca.json	Weblate translations (2018-07-05) (#7950)	7 years ago
co.json	Weblate translations (2018-07-05) (#7950)	7 years ago
da.json	Weblate translations (2018-07-05) (#7950)	7 years ago
de.json	Weblate translations (2018-07-05) (#7950)	7 years ago
defaultMessages.json	Merge branch 'master' into glitch-soc/tentative-merge	7 years ago
el.json	Weblate translations (2018-07-05) (#7950)	7 years ago
en.json	Merge branch 'master' into glitch-soc/tentative-merge	7 years ago
eo.json	Weblate translations (2018-07-05) (#7950)	7 years ago
es.json	Weblate translations (2018-07-05) (#7950)	7 years ago
eu.json	Weblate translations (2018-07-05) (#7950)	7 years ago
fa.json	Weblate translations (2018-07-05) (#7950)	7 years ago
fi.json	Weblate translations (2018-07-05) (#7950)	7 years ago
fr.json	Weblate translations (2018-07-05) (#7950)	7 years ago
gl.json	Weblate translations (2018-07-05) (#7950)	7 years ago
he.json	Weblate translations (2018-07-05) (#7950)	7 years ago
hr.json	Weblate translations (2018-07-05) (#7950)	7 years ago
hu.json	Weblate translations (2018-07-05) (#7950)	7 years ago
hy.json	Weblate translations (2018-07-05) (#7950)	7 years ago
id.json	Weblate translations (2018-07-05) (#7950)	7 years ago
index.js	Finalized theme loading and stuff	7 years ago
io.json	Weblate translations (2018-07-05) (#7950)	7 years ago
it.json	Weblate translations (2018-07-05) (#7950)	7 years ago
ja.json	Merge branch 'master' into glitch-soc/tentative-merge	7 years ago
ko.json	Weblate translations (2018-07-05) (#7950)	7 years ago
nl.json	Weblate translations (2018-07-05) (#7950)	7 years ago
no.json	Weblate translations (2018-07-05) (#7950)	7 years ago
oc.json	Weblate translations (2018-07-05) (#7950)	7 years ago
pl.json	Merge branch 'master' into glitch-soc/tentative-merge	7 years ago
pt-BR.json	Weblate translations (2018-07-05) (#7950)	7 years ago
pt.json	Weblate translations (2018-07-05) (#7950)	7 years ago
ru.json	Weblate translations (2018-07-05) (#7950)	7 years ago
sk.json	Weblate translations (2018-07-05) (#7950)	7 years ago
sl.json	Weblate translations (2018-07-05) (#7950)	7 years ago
sr-Latn.json	Weblate translations (2018-07-05) (#7950)	7 years ago
sr.json	Weblate translations (2018-07-05) (#7950)	7 years ago
sv.json	Weblate translations (2018-07-05) (#7950)	7 years ago
te.json	Weblate translations (2018-07-05) (#7950)	7 years ago
th.json	Weblate translations (2018-07-05) (#7950)	7 years ago
tr.json	Weblate translations (2018-07-05) (#7950)	7 years ago
uk.json	Weblate translations (2018-07-05) (#7950)	7 years ago
whitelist_ar.json	…
whitelist_bg.json	…
whitelist_ca.json	Fix minor Japanese translations (#3099)	8 years ago
whitelist_co.json	Add Corsican localization (#7390)	7 years ago
whitelist_de.json	…
whitelist_el.json	Add el and te (#7332)	7 years ago
whitelist_en.json	…
whitelist_eo.json	…
whitelist_es.json	…
whitelist_eu.json	Add el and te (#7332)	7 years ago
whitelist_fa.json	…
whitelist_fi.json	…
whitelist_fr.json	…
whitelist_gl.json	Weblate translations (#5946)	7 years ago
whitelist_he.json	…
whitelist_hr.json	…
whitelist_hu.json	…
whitelist_hy.json	Weblate translations (#6323)	7 years ago
whitelist_id.json	…
whitelist_io.json	…
whitelist_it.json	…
whitelist_ja.json	Simplify getting started links localization. Link "powered by Mastodon" to joinmastodon.org (#3725)	8 years ago
whitelist_ko.json	i18n: Add korean translation (#4064)	8 years ago
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	Add Japanese translations #5997, #6003, #6004, #6071, #6099, #6125 and #6132 (#6167)	7 years ago
whitelist_sl.json	Weblate translations (2018-05-10) (#7438)	7 years ago
whitelist_sr-Latn.json	Fix RFC 5646 Regular Expression (#6190)	7 years ago
whitelist_sr.json	Add Japanese translations #5997, #6003, #6004, #6071, #6099, #6125 and #6132 (#6167)	7 years ago
whitelist_sv.json	Add Japanese translations (#5810)	7 years ago
whitelist_te.json	Add el and te (#7332)	7 years ago
whitelist_th.json	Add th.json. (#3588)	8 years ago
whitelist_tr.json	…
whitelist_uk.json	…
whitelist_zh-CN.json	…
whitelist_zh-HK.json	Fix regular expression for RFC 5646 (regression from #3604) (#4133)	8 years ago
whitelist_zh-TW.json	Add zh-TW.json (#3459)	8 years ago
zh-CN.json	Weblate translations (2018-07-05) (#7950)	7 years ago
zh-HK.json	Weblate translations (2018-07-05) (#7950)	7 years ago
zh-TW.json	Weblate translations (2018-07-05) (#7950)	7 years ago