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

2018-04-18 18:48:12 -05:00

..

ar.json

Direct messages column (#4514)

2018-04-18 13:09:06 +02:00

bg.json

Direct messages column (#4514)

2018-04-18 13:09:06 +02:00

ca.json

Direct messages column (#4514)

2018-04-18 13:09:06 +02:00

de.json

Direct messages column (#4514)

2018-04-18 13:09:06 +02:00

defaultMessages.json

Merge remote-tracking branch 'origin/master' into gs-master

2018-04-18 18:48:12 -05:00

en.json

Merge remote-tracking branch 'origin/master' into gs-master

2018-04-18 18:48:12 -05:00

eo.json

Direct messages column (#4514)

2018-04-18 13:09:06 +02:00

es.json

Direct messages column (#4514)

2018-04-18 13:09:06 +02:00

fa.json

Direct messages column (#4514)

2018-04-18 13:09:06 +02:00

fi.json

Direct messages column (#4514)

2018-04-18 13:09:06 +02:00

fr.json

Direct messages column (#4514)

2018-04-18 13:09:06 +02:00

gl.json

Direct messages column (#4514)

2018-04-18 13:09:06 +02:00

he.json

Direct messages column (#4514)

2018-04-18 13:09:06 +02:00

hr.json

Direct messages column (#4514)

2018-04-18 13:09:06 +02:00

hu.json

Direct messages column (#4514)

2018-04-18 13:09:06 +02:00

hy.json

Direct messages column (#4514)

2018-04-18 13:09:06 +02:00

id.json

Direct messages column (#4514)

2018-04-18 13:09:06 +02:00

index.js

…

io.json

Direct messages column (#4514)

2018-04-18 13:09:06 +02:00

it.json

Direct messages column (#4514)

2018-04-18 13:09:06 +02:00

ja.json

Merge remote-tracking branch 'origin/master' into gs-master

2018-04-18 18:48:12 -05:00

ko.json

Direct messages column (#4514)

2018-04-18 13:09:06 +02:00

nl.json

Direct messages column (#4514)

2018-04-18 13:09:06 +02:00

no.json

Direct messages column (#4514)

2018-04-18 13:09:06 +02:00

oc.json

Direct messages column (#4514)

2018-04-18 13:09:06 +02:00

pl.json

Merge remote-tracking branch 'origin/master' into gs-master

2018-04-18 18:48:12 -05:00

pt-BR.json

Direct messages column (#4514)

2018-04-18 13:09:06 +02:00

pt.json

Direct messages column (#4514)

2018-04-18 13:09:06 +02:00

ru.json

Direct messages column (#4514)

2018-04-18 13:09:06 +02:00

sk.json

Direct messages column (#4514)

2018-04-18 13:09:06 +02:00

sr-Latn.json

Direct messages column (#4514)

2018-04-18 13:09:06 +02:00

sr.json

Direct messages column (#4514)

2018-04-18 13:09:06 +02:00

sv.json

Direct messages column (#4514)

2018-04-18 13:09:06 +02:00

th.json

Direct messages column (#4514)

2018-04-18 13:09:06 +02:00

tr.json

Direct messages column (#4514)

2018-04-18 13:09:06 +02:00

uk.json

Direct messages column (#4514)

2018-04-18 13:09:06 +02:00

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)

2018-04-18 13:09:06 +02:00

zh-HK.json

Direct messages column (#4514)

2018-04-18 13:09:06 +02:00

zh-TW.json

Direct messages column (#4514)

2018-04-18 13:09:06 +02:00