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.

David Yip 16d5217502 Merge remote-tracking branch 'origin/master' into gs-master ... Conflicts: app/controllers/home_controller.rb app/controllers/stream_entries_controller.rb app/javascript/mastodon/locales/ja.json app/javascript/mastodon/locales/pl.json		7 years ago
..
ar.json	Direct messages column (#4514)	7 years ago
bg.json	Direct messages column (#4514)	7 years ago
ca.json	Direct messages column (#4514)	7 years ago
de.json	Direct messages column (#4514)	7 years ago
defaultMessages.json	Merge remote-tracking branch 'origin/master' into gs-master	7 years ago
en.json	Merge remote-tracking branch 'origin/master' into gs-master	7 years ago
eo.json	Direct messages column (#4514)	7 years ago
es.json	Direct messages column (#4514)	7 years ago
fa.json	Direct messages column (#4514)	7 years ago
fi.json	Direct messages column (#4514)	7 years ago
fr.json	Direct messages column (#4514)	7 years ago
gl.json	Direct messages column (#4514)	7 years ago
he.json	Direct messages column (#4514)	7 years ago
hr.json	Direct messages column (#4514)	7 years ago
hu.json	Direct messages column (#4514)	7 years ago
hy.json	Direct messages column (#4514)	7 years ago
id.json	Direct messages column (#4514)	7 years ago
index.js	…
io.json	Direct messages column (#4514)	7 years ago
it.json	Direct messages column (#4514)	7 years ago
ja.json	Merge remote-tracking branch 'origin/master' into gs-master	7 years ago
ko.json	Direct messages column (#4514)	7 years ago
nl.json	Direct messages column (#4514)	7 years ago
no.json	Direct messages column (#4514)	7 years ago
oc.json	Direct messages column (#4514)	7 years ago
pl.json	Merge remote-tracking branch 'origin/master' into gs-master	7 years ago
pt-BR.json	Direct messages column (#4514)	7 years ago
pt.json	Direct messages column (#4514)	7 years ago
ru.json	Direct messages column (#4514)	7 years ago
sk.json	Direct messages column (#4514)	7 years ago
sr-Latn.json	Direct messages column (#4514)	7 years ago
sr.json	Direct messages column (#4514)	7 years ago
sv.json	Direct messages column (#4514)	7 years ago
th.json	Direct messages column (#4514)	7 years ago
tr.json	Direct messages column (#4514)	7 years ago
uk.json	Direct messages column (#4514)	7 years ago
whitelist_ar.json	…
whitelist_bg.json	…
whitelist_ca.json	…
whitelist_de.json	…
whitelist_en.json	…
whitelist_eo.json	…
whitelist_es.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_sr-Latn.json	…
whitelist_sr.json	…
whitelist_sv.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	Direct messages column (#4514)	7 years ago
zh-HK.json	Direct messages column (#4514)	7 years ago
zh-TW.json	Direct messages column (#4514)	7 years ago