David Yip a6fb1c58ee Merge remote-tracking branch 'origin/master' into merge-upstream ... Conflicts: .env.production.sample app/controllers/auth/confirmations_controller.rb db/schema.rb		2018-02-04 16:36:19 -06:00
..
activerecord.ar.yml
activerecord.ca.yml
activerecord.de.yml
activerecord.en.yml
activerecord.es.yml
activerecord.fa.yml
activerecord.fr.yml
activerecord.gl.yml
activerecord.he.yml
activerecord.id.yml
activerecord.it.yml
activerecord.ja.yml
activerecord.nl.yml
activerecord.no.yml
activerecord.oc.yml
activerecord.pl.yml
activerecord.pt-BR.yml
activerecord.pt.yml
activerecord.ru.yml
activerecord.sk.yml
activerecord.sr-Latn.yml
activerecord.sr.yml
activerecord.th.yml
activerecord.uk.yml
activerecord.zh-CN.yml
ar.yml
bg.yml
ca.yml
de.yml
devise.ar.yml
devise.bg.yml
devise.ca.yml
devise.de.yml
devise.en.yml
devise.eo.yml
devise.es.yml
devise.fa.yml
devise.fi.yml	Run i18n-tasks normalize (#5003)	2017-09-19 03:27:08 +02:00
devise.fr.yml
devise.gl.yml
devise.he.yml
devise.hr.yml
devise.hu.yml
devise.id.yml
devise.io.yml
devise.it.yml
devise.ja.yml
devise.nl.yml
devise.no.yml	Weblate translations (#6370)	2018-01-28 22:48:09 +09:00
devise.oc.yml
devise.pl.yml
devise.pt-BR.yml
devise.pt.yml
devise.ru.yml	Russian language updated (#6397)	2018-02-01 07:33:54 +09:00
devise.sk.yml
devise.sr-Latn.yml
devise.sr.yml
devise.sv.yml
devise.th.yml
devise.tr.yml
devise.uk.yml
devise.zh-CN.yml
devise.zh-HK.yml
devise.zh-TW.yml
doorkeeper.ar.yml
doorkeeper.bg.yml	Oauth code in input form and add description message (#4986)	2017-09-17 15:23:44 +02:00
doorkeeper.ca.yml	Weblate translations (#5922)	2017-12-08 01:59:44 +01:00
doorkeeper.de.yml
doorkeeper.en.yml
doorkeeper.eo.yml
doorkeeper.es.yml
doorkeeper.fa.yml	Oauth code in input form and add description message (#4986)	2017-09-17 15:23:44 +02:00
doorkeeper.fi.yml
doorkeeper.fr.yml	Weblate translations (#6370)	2018-01-28 22:48:09 +09:00
doorkeeper.gl.yml	Weblate translations (#6228)	2018-01-09 20:30:28 +09:00
doorkeeper.he.yml
doorkeeper.hr.yml	Oauth code in input form and add description message (#4986)	2017-09-17 15:23:44 +02:00
doorkeeper.hu.yml
doorkeeper.id.yml
doorkeeper.io.yml
doorkeeper.it.yml
doorkeeper.ja.yml
doorkeeper.nl.yml	Weblate translations (#6228)	2018-01-09 20:30:28 +09:00
doorkeeper.no.yml
doorkeeper.oc.yml
doorkeeper.pl.yml
doorkeeper.pt-BR.yml	Weblate translations (#5922)	2017-12-08 01:59:44 +01:00
doorkeeper.pt.yml	Weblate translations (#6228)	2018-01-09 20:30:28 +09:00
doorkeeper.ru.yml
doorkeeper.sk.yml
doorkeeper.sr-Latn.yml
doorkeeper.sr.yml	Adding Serbian translation (#6133)	2017-12-31 17:28:20 +09:00
doorkeeper.sv.yml
doorkeeper.th.yml
doorkeeper.uk.yml
doorkeeper.zh-CN.yml
doorkeeper.zh-HK.yml
doorkeeper.zh-TW.yml
en.yml
eo.yml
es.yml
fa.yml
fi.yml
fr.yml
gl.yml
he.yml
hr.yml	Replace tutorial modal with welcome e-mail (#6273)	2018-01-18 19:17:25 +01:00
hu.yml
id.yml
io.yml
it.yml
ja.yml
ko.yml
nl.yml
no.yml
oc.yml
pl.yml
pt-BR.yml
pt.yml
ru.yml
simple_form.ar.yml
simple_form.bg.yml
simple_form.ca.yml
simple_form.de.yml
simple_form.en.yml
simple_form.eo.yml
simple_form.es.yml
simple_form.fa.yml
simple_form.fi.yml
simple_form.fr.yml
simple_form.gl.yml
simple_form.he.yml
simple_form.hr.yml
simple_form.hu.yml
simple_form.id.yml
simple_form.io.yml
simple_form.it.yml
simple_form.ja.yml
simple_form.ko.yml
simple_form.nl.yml
simple_form.no.yml
simple_form.oc.yml
simple_form.pl.yml
simple_form.pt-BR.yml
simple_form.pt.yml
simple_form.ru.yml
simple_form.sk.yml
simple_form.sr-Latn.yml
simple_form.sr.yml
simple_form.sv.yml
simple_form.th.yml
simple_form.tr.yml
simple_form.uk.yml
simple_form.zh-CN.yml
simple_form.zh-HK.yml
simple_form.zh-TW.yml	Improve Traditional Chinese translation (#6166)	2018-01-04 05:00:50 +01:00
sk.yml
sr-Latn.yml	Replace tutorial modal with welcome e-mail (#6273)	2018-01-18 19:17:25 +01:00
sr.yml
sv.yml
th.yml
tr.yml
uk.yml
zh-CN.yml
zh-HK.yml
zh-TW.yml