Glitch-Shrike/config/locales
Thibaut Girka f26f1145ac Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
	Dockerfile
	app/javascript/packs/common.js
	config/webpack/loaders/sass.js
	config/webpack/shared.js
	db/schema.rb
	package.json
	yarn.lock

A lot of the conflicts come from updating webpack.

Even though upstream deleted app/javascript/packs/common.js, I kept
glitch-soc's version as it unifies JS/CSS packs behavior across flavours.

Ported glitch changes to webpack 4.x
2018-07-16 14:50:42 +02:00
..
activerecord.ar.yml
activerecord.ca.yml
activerecord.co.yml
activerecord.cs.yml
activerecord.da.yml
activerecord.de.yml
activerecord.el.yml
activerecord.en.yml
activerecord.es.yml
activerecord.eu.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.sl.yml
activerecord.sr-Latn.yml
activerecord.sr.yml
activerecord.sv.yml
activerecord.th.yml
activerecord.uk.yml
activerecord.zh-CN.yml
activerecord.zh-HK.yml
ar.yml
bg.yml
ca.yml
co.yml
cs.yml
da.yml
de.yml
devise.ar.yml
devise.bg.yml
devise.ca.yml
devise.co.yml
devise.cs.yml
devise.da.yml
devise.de.yml
devise.el.yml
devise.en.yml
devise.eo.yml
devise.es.yml
devise.eu.yml
devise.fa.yml
devise.fi.yml
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
devise.oc.yml
devise.pl.yml
devise.pt-BR.yml
devise.pt.yml
devise.ru.yml
devise.sk.yml
devise.sl.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
doorkeeper.ca.yml
doorkeeper.co.yml
doorkeeper.cs.yml
doorkeeper.da.yml
doorkeeper.de.yml
doorkeeper.el.yml
doorkeeper.en.yml
doorkeeper.eo.yml
doorkeeper.es.yml
doorkeeper.eu.yml
doorkeeper.fa.yml
doorkeeper.fi.yml
doorkeeper.fr.yml
doorkeeper.gl.yml
doorkeeper.he.yml
doorkeeper.hr.yml
doorkeeper.hu.yml
doorkeeper.id.yml
doorkeeper.io.yml
doorkeeper.it.yml
doorkeeper.ja.yml
doorkeeper.nl.yml
doorkeeper.no.yml
doorkeeper.oc.yml
doorkeeper.pl.yml
doorkeeper.pt-BR.yml
doorkeeper.pt.yml
doorkeeper.ru.yml
doorkeeper.sk.yml
doorkeeper.sl.yml
doorkeeper.sr-Latn.yml
doorkeeper.sr.yml
doorkeeper.sv.yml
doorkeeper.th.yml
doorkeeper.uk.yml
doorkeeper.zh-CN.yml
doorkeeper.zh-HK.yml
doorkeeper.zh-TW.yml
el.yml
en.yml Merge branch 'master' into glitch-soc/merge-upstream 2018-07-16 14:50:42 +02:00
eo.yml
es.yml
eu.yml
fa.yml
fi.yml
fr.yml
gl.yml Merge branch 'master' into glitch-soc/merge-upstream 2018-07-16 14:50:42 +02:00
he.yml
hr.yml
hu.yml
id.yml
io.yml
it.yml
ja.yml Merge branch 'master' into glitch-soc/merge-upstream 2018-07-16 14:50:42 +02:00
ko.yml
ms.yml
nl.yml Merge branch 'master' into glitch-soc/merge-upstream 2018-07-16 14:50:42 +02:00
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.co.yml
simple_form.cs.yml
simple_form.da.yml
simple_form.de.yml
simple_form.el.yml
simple_form.en.yml Merge branch 'master' into glitch-soc/merge-upstream 2018-07-16 14:50:42 +02:00
simple_form.eo.yml
simple_form.es.yml
simple_form.eu.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 Merge branch 'master' into glitch-soc/merge-upstream 2018-07-16 14:50:42 +02:00
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.sl.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
sk.yml Merge branch 'master' into glitch-soc/merge-upstream 2018-07-16 14:50:42 +02:00
sl.yml
sr-Latn.yml
sr.yml
sv.yml
te.yml
th.yml
tr.yml
uk.yml
zh-CN.yml
zh-HK.yml
zh-TW.yml