David Yip 67ad453373 Merge tag 'v1.6.0rc4' into sync/upstream-1.6.0rc4 ... Conflicts: app/javascript/mastodon/features/getting_started/index.js app/javascript/packs/public.js app/javascript/styles/components.scss		2017-09-09 23:56:21 -05:00
..
locale-data
ar.json
bg.json
ca.json
de.json	Make german translation more gender neutral #4755 (#4789)	2017-09-03 15:17:24 +02:00
defaultMessages.json	Merge branch 'origin/master' into sync/upstream	2017-09-09 14:27:47 -05:00
en.json	Add Pinned toot column (#4817)	2017-09-07 09:58:11 +02:00
eo.json
es.json
fa.json	i18n: update Persian translation (#4822)	2017-09-06 17:31:54 +02:00
fi.json
fr.json	i10n update OC and FR (#4849)	2017-09-08 13:55:47 +02:00
he.json
hr.json	Croatian translation - updated (#4183)	2017-09-03 18:10:53 +09:00
hu.json
id.json
index.js
io.json
it.json
ja.json	Add Pinned toot column (#4817)	2017-09-07 09:58:11 +02:00
ko.json	Add Pinned toot column (#4817)	2017-09-07 09:58:11 +02:00
nl.json
no.json
oc.json	i10n update OC and FR (#4849)	2017-09-08 13:55:47 +02:00
pl.json	i18n: Update Polish translation (#4845)	2017-09-08 05:51:48 +09:00
pt-BR.json
pt.json
ru.json
th.json
tr.json
uk.json
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_he.json
whitelist_hr.json
whitelist_hu.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_th.json
whitelist_tr.json
whitelist_uk.json
whitelist_zh-CN.json
whitelist_zh-HK.json
whitelist_zh-TW.json
zh-CN.json
zh-HK.json
zh-TW.json