David Yip 1b8fcd4df5

Merge remote-tracking branch 'origin/master' into merge-upstream ...

Conflicts:
 	README.md
 	app/controllers/follower_accounts_controller.rb
 	app/controllers/following_accounts_controller.rb
 	app/serializers/rest/instance_serializer.rb
 	app/views/stream_entries/_simple_status.html.haml
 	config/locales/simple_form.ja.yml

2018-03-02 21:46:44 -06:00

..

ar.json

Weblate translations (2018-03-02) (#6588)

2018-03-02 04:36:16 +01:00

bg.json

i18n: Update Japanese translations (#6581)

2018-03-02 07:48:17 +09:00

ca.json

Weblate translations (2018-03-02) (#6588)

2018-03-02 04:36:16 +01:00

de.json

i18n: Update Japanese translations (#6581)

2018-03-02 07:48:17 +09:00

defaultMessages.json

Merge remote-tracking branch 'origin/master' into merge-upstream

2018-03-02 21:46:44 -06:00

en.json

Merge remote-tracking branch 'origin/master' into merge-upstream

2018-03-02 21:46:44 -06:00

eo.json

Weblate translations (2018-03-02) (#6588)

2018-03-02 04:36:16 +01:00

es.json

i18n: Update Japanese translations (#6581)

2018-03-02 07:48:17 +09:00

fa.json

i18n: Update Japanese translations (#6581)

2018-03-02 07:48:17 +09:00

fi.json

Weblate translations (2018-03-02) (#6588)

2018-03-02 04:36:16 +01:00

fr.json

Weblate translations (2018-03-02) (#6588)

2018-03-02 04:36:16 +01:00

gl.json

Weblate translations (2018-03-02) (#6588)

2018-03-02 04:36:16 +01:00

he.json

i18n: Update Japanese translations (#6581)

2018-03-02 07:48:17 +09:00

hr.json

i18n: Update Japanese translations (#6581)

2018-03-02 07:48:17 +09:00

hu.json

Weblate translations (2018-03-02) (#6588)

2018-03-02 04:36:16 +01:00

hy.json

i18n: Update Japanese translations (#6581)

2018-03-02 07:48:17 +09:00

id.json

i18n: Update Japanese translations (#6581)

2018-03-02 07:48:17 +09:00

index.js

…

io.json

i18n: Update Japanese translations (#6581)

2018-03-02 07:48:17 +09:00

it.json

i18n: Update Japanese translations (#6581)

2018-03-02 07:48:17 +09:00

ja.json

Merge remote-tracking branch 'origin/master' into merge-upstream

2018-03-02 21:46:44 -06:00

ko.json

i18n: Update Japanese translations (#6581)

2018-03-02 07:48:17 +09:00

nl.json

Weblate translations (2018-03-02) (#6588)

2018-03-02 04:36:16 +01:00

no.json

i18n: Update Japanese translations (#6581)

2018-03-02 07:48:17 +09:00

oc.json

i18n: Update Japanese translations (#6581)

2018-03-02 07:48:17 +09:00

pl.json

Merge remote-tracking branch 'origin/master' into merge-upstream

2018-03-02 21:46:44 -06:00

pt-BR.json

Weblate translations (2018-03-02) (#6588)

2018-03-02 04:36:16 +01:00

pt.json

i18n: Update Japanese translations (#6581)

2018-03-02 07:48:17 +09:00

ru.json

i18n: Update Japanese translations (#6581)

2018-03-02 07:48:17 +09:00

sk.json

Weblate translations (2018-03-02) (#6588)

2018-03-02 04:36:16 +01:00

sr-Latn.json

i18n: Update Japanese translations (#6581)

2018-03-02 07:48:17 +09:00

sr.json

i18n: Update Japanese translations (#6581)

2018-03-02 07:48:17 +09:00

sv.json

i18n: Update Japanese translations (#6581)

2018-03-02 07:48:17 +09:00

th.json

i18n: Update Japanese translations (#6581)

2018-03-02 07:48:17 +09:00

tr.json

i18n: Update Japanese translations (#6581)

2018-03-02 07:48:17 +09:00

uk.json

i18n: Update Japanese translations (#6581)

2018-03-02 07:48:17 +09: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

i18n: Update Japanese translations (#6581)

2018-03-02 07:48:17 +09:00

zh-HK.json

i18n: Update Japanese translations (#6581)

2018-03-02 07:48:17 +09:00

zh-TW.json

i18n: Update Japanese translations (#6581)

2018-03-02 07:48:17 +09:00