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	Finalized theme loading and stuff	7 years ago
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	Add final newline to locale files (#2890)	8 years ago
whitelist_bg.json	Add final newline to locale files (#2890)	8 years ago
whitelist_ca.json	Fix minor Japanese translations (#3099)	8 years ago
whitelist_de.json	Add final newline to locale files (#2890)	8 years ago
whitelist_en.json	Add final newline to locale files (#2890)	8 years ago
whitelist_eo.json	Add final newline to locale files (#2890)	8 years ago
whitelist_es.json	Add final newline to locale files (#2890)	8 years ago
whitelist_fa.json	Add final newline to locale files (#2890)	8 years ago
whitelist_fi.json	Add final newline to locale files (#2890)	8 years ago
whitelist_fr.json	Add final newline to locale files (#2890)	8 years ago
whitelist_gl.json	Weblate translations (#5946)	7 years ago
whitelist_he.json	Add final newline to locale files (#2890)	8 years ago
whitelist_hr.json	Add final newline to locale files (#2890)	8 years ago
whitelist_hu.json	Add final newline to locale files (#2890)	8 years ago
whitelist_hy.json	Weblate translations (#6323)	7 years ago
whitelist_id.json	Add final newline to locale files (#2890)	8 years ago
whitelist_io.json	Add final newline to locale files (#2890)	8 years ago
whitelist_it.json	Add final newline to locale files (#2890)	8 years ago
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)	7 years ago
whitelist_nl.json	Add final newline to locale files (#2890)	8 years ago
whitelist_no.json	Add final newline to locale files (#2890)	8 years ago
whitelist_oc.json	Add final newline to locale files (#2890)	8 years ago
whitelist_pl.json	Add final newline to locale files (#2890)	8 years ago
whitelist_pt-BR.json	Add final newline to locale files (#2890)	8 years ago
whitelist_pt.json	Add final newline to locale files (#2890)	8 years ago
whitelist_ru.json	Add final newline to locale files (#2890)	8 years ago
whitelist_sk.json	Add Japanese translations #5997, #6003, #6004, #6071, #6099, #6125 and #6132 (#6167)	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_th.json	Add th.json. (#3588)	8 years ago
whitelist_tr.json	Fix duplicated values in nl.json (#2931)	8 years ago
whitelist_uk.json	Add final newline to locale files (#2890)	8 years ago
whitelist_zh-CN.json	Add final newline to locale files (#2890)	8 years ago
whitelist_zh-HK.json	Fix regular expression for RFC 5646 (regression from #3604) (#4133)	7 years ago
whitelist_zh-TW.json	Add zh-TW.json (#3459)	8 years ago
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