You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Thibaut Girka 1488be7d96 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/controllers/home_controller.rb - app/controllers/shares_controller.rb - app/javascript/packs/public.js - app/models/status.rb - app/serializers/initial_state_serializer.rb - app/views/home/index.html.haml - app/views/layouts/public.html.haml - app/views/public_timelines/show.html.haml - app/views/shares/show.html.haml - app/views/tags/show.html.haml - config/initializers/content_security_policy.rb - config/locales/en.yml - config/webpack/shared.js - package.json		5 years ago
..
activerecord.ar.yml	…
activerecord.ast.yml	…
activerecord.bg.yml	…
activerecord.bn.yml	New Crowdin translations (#11153)	5 years ago
activerecord.ca.yml	…
activerecord.co.yml	…
activerecord.cs.yml	…
activerecord.cy.yml	New Crowdin translations (#11153)	5 years ago
activerecord.da.yml	…
activerecord.de.yml	…
activerecord.el.yml	…
activerecord.en.yml	…
activerecord.eo.yml	…
activerecord.es.yml	…
activerecord.et.yml	New Crowdin translations (#11305)	5 years ago
activerecord.eu.yml	…
activerecord.fa.yml	New Crowdin translations (#11077)	5 years ago
activerecord.fi.yml	New Crowdin translations (#11116)	5 years ago
activerecord.fr.yml	…
activerecord.gl.yml	…
activerecord.he.yml	…
activerecord.hr.yml	…
activerecord.hu.yml	New Crowdin translations (#11305)	5 years ago
activerecord.hy.yml	…
activerecord.id.yml	…
activerecord.io.yml	…
activerecord.it.yml	New Crowdin translations (#11116)	5 years ago
activerecord.ja.yml	…
activerecord.ka.yml	…
activerecord.kk.yml	…
activerecord.ko.yml	…
activerecord.lt.yml	…
activerecord.lv.yml	…
activerecord.ms.yml	…
activerecord.nl.yml	…
activerecord.no.yml	…
activerecord.oc.yml	…
activerecord.pl.yml	…
activerecord.pt-BR.yml	…
activerecord.pt.yml	…
activerecord.ro.yml	…
activerecord.ru.yml	…
activerecord.sk.yml	…
activerecord.sl.yml	New Crowdin translations (#11077)	5 years ago
activerecord.sq.yml	…
activerecord.sr-Latn.yml	…
activerecord.sr.yml	…
activerecord.sv.yml	…
activerecord.ta.yml	…
activerecord.te.yml	…
activerecord.th.yml	New Crowdin translations (#11077)	5 years ago
activerecord.tr.yml	…
activerecord.uk.yml	New Crowdin translations (#11305)	5 years ago
activerecord.zh-CN.yml	…
activerecord.zh-HK.yml	…
activerecord.zh-TW.yml	…
activerecord.zh_Hant.yml	…
ar.yml	New Crowdin translations (#11305)	5 years ago
ast.yml	New Crowdin translations (#11153)	5 years ago
bg.yml	…
bn.yml	…
ca.yml	New Crowdin translations (#11305)	5 years ago
co.yml	New Crowdin translations (#11596)	5 years ago
cs.yml	New Crowdin translations (#11305)	5 years ago
cy.yml	New Crowdin translations (#11305)	5 years ago
da.yml	New Crowdin translations (#11305)	5 years ago
de.yml	New Crowdin translations (#11596)	5 years ago
devise.ar.yml	New Crowdin translations (#11077)	5 years ago
devise.ast.yml	…
devise.bg.yml	…
devise.bn.yml	New Crowdin translations (#11153)	5 years ago
devise.ca.yml	…
devise.co.yml	…
devise.cs.yml	…
devise.cy.yml	New Crowdin translations (#11077)	5 years ago
devise.da.yml	…
devise.de.yml	…
devise.el.yml	…
devise.en.yml	…
devise.eo.yml	…
devise.es.yml	…
devise.et.yml	New Crowdin translations (#11305)	5 years ago
devise.eu.yml	…
devise.fa.yml	…
devise.fi.yml	…
devise.fr.yml	…
devise.gl.yml	…
devise.he.yml	…
devise.hr.yml	…
devise.hu.yml	New Crowdin translations (#11077)	5 years ago
devise.hy.yml	…
devise.id.yml	…
devise.io.yml	…
devise.it.yml	New Crowdin translations (#11116)	5 years ago
devise.ja.yml	…
devise.ka.yml	…
devise.kk.yml	…
devise.ko.yml	…
devise.lt.yml	…
devise.lv.yml	…
devise.ms.yml	…
devise.nl.yml	…
devise.no.yml	…
devise.oc.yml	…
devise.pl.yml	…
devise.pt-BR.yml	…
devise.pt.yml	…
devise.ro.yml	…
devise.ru.yml	…
devise.sk.yml	New Crowdin translations (#11153)	5 years ago
devise.sl.yml	New Crowdin translations (#11153)	5 years ago
devise.sq.yml	…
devise.sr-Latn.yml	…
devise.sr.yml	…
devise.sv.yml	…
devise.ta.yml	…
devise.te.yml	…
devise.th.yml	New Crowdin translations (#11305)	5 years ago
devise.tr.yml	…
devise.uk.yml	New Crowdin translations (#11305)	5 years ago
devise.zh-CN.yml	New Crowdin translations (#11153)	5 years ago
devise.zh-HK.yml	…
devise.zh-TW.yml	…
doorkeeper.ar.yml	New Crowdin translations (#11077)	5 years ago
doorkeeper.ast.yml	…
doorkeeper.bg.yml	…
doorkeeper.bn.yml	…
doorkeeper.ca.yml	New Crowdin translations (#11144)	5 years ago
doorkeeper.co.yml	New Crowdin translations (#11116)	5 years ago
doorkeeper.cs.yml	New Crowdin translations (#11116)	5 years ago
doorkeeper.cy.yml	New Crowdin translations (#11153)	5 years ago
doorkeeper.da.yml	…
doorkeeper.de.yml	New Crowdin translations (#11144)	5 years ago
doorkeeper.el.yml	New Crowdin translations (#11116)	5 years ago
doorkeeper.en.yml	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
doorkeeper.eo.yml	New Crowdin translations (#11305)	5 years ago
doorkeeper.es.yml	New Crowdin translations (#11153)	5 years ago
doorkeeper.et.yml	New Crowdin translations (#11305)	5 years ago
doorkeeper.eu.yml	New Crowdin translations (#11153)	5 years ago
doorkeeper.fa.yml	…
doorkeeper.fi.yml	…
doorkeeper.fr.yml	…
doorkeeper.gl.yml	New Crowdin translations (#11144)	5 years ago
doorkeeper.he.yml	…
doorkeeper.hr.yml	…
doorkeeper.hu.yml	New Crowdin translations (#11153)	5 years ago
doorkeeper.hy.yml	…
doorkeeper.id.yml	…
doorkeeper.io.yml	…
doorkeeper.it.yml	New Crowdin translations (#11116)	5 years ago
doorkeeper.ja.yml	New Crowdin translations (#11116)	5 years ago
doorkeeper.ka.yml	…
doorkeeper.kk.yml	…
doorkeeper.ko.yml	New Crowdin translations (#11305)	5 years ago
doorkeeper.lt.yml	…
doorkeeper.lv.yml	…
doorkeeper.ms.yml	…
doorkeeper.nl.yml	New Crowdin translations (#11153)	5 years ago
doorkeeper.no.yml	…
doorkeeper.oc.yml	New Crowdin translations (#11153)	5 years ago
doorkeeper.pl.yml	New Crowdin translations (#11116)	5 years ago
doorkeeper.pt-BR.yml	…
doorkeeper.pt.yml	…
doorkeeper.ro.yml	…
doorkeeper.ru.yml	New Crowdin translations (#11305)	5 years ago
doorkeeper.sk.yml	New Crowdin translations (#11305)	5 years ago
doorkeeper.sl.yml	New Crowdin translations (#11116)	5 years ago
doorkeeper.sq.yml	…
doorkeeper.sr-Latn.yml	…
doorkeeper.sr.yml	…
doorkeeper.sv.yml	…
doorkeeper.ta.yml	…
doorkeeper.te.yml	…
doorkeeper.th.yml	New Crowdin translations (#11077)	5 years ago
doorkeeper.tr.yml	…
doorkeeper.uk.yml	New Crowdin translations (#11305)	5 years ago
doorkeeper.zh-CN.yml	New Crowdin translations (#11153)	5 years ago
doorkeeper.zh-HK.yml	…
doorkeeper.zh-TW.yml	…
el.yml	New Crowdin translations (#11305)	5 years ago
en.yml	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
en_GB.yml	…
eo.yml	New Crowdin translations (#11305)	5 years ago
es.yml	New Crowdin translations (#11305)	5 years ago
et.yml	New Crowdin translations (#11305)	5 years ago
eu.yml	New Crowdin translations (#11305)	5 years ago
fa.yml	New Crowdin translations (#11305)	5 years ago
fi.yml	New Crowdin translations (#11305)	5 years ago
fr.yml	New Crowdin translations (#11305)	5 years ago
ga.yml	…
gl.yml	New Crowdin translations (#11305)	5 years ago
he.yml	New Crowdin translations (#11153)	5 years ago
hi.yml	…
hr.yml	…
hu.yml	New Crowdin translations (#11305)	5 years ago
hy.yml	New Crowdin translations (#11305)	5 years ago
id.yml	New Crowdin translations (#11153)	5 years ago
io.yml	…
it.yml	New Crowdin translations (#11593)	5 years ago
ja.yml	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
ka.yml	New Crowdin translations (#11305)	5 years ago
kk.yml	New Crowdin translations (#11305)	5 years ago
ko.yml	New Crowdin translations (#11596)	5 years ago
lt.yml	New Crowdin translations (#11305)	5 years ago
lv.yml	…
ms.yml	…
nl.yml	New Crowdin translations (#11305)	5 years ago
no.yml	New Crowdin translations (#11153)	5 years ago
oc.yml	New Crowdin translations (#11305)	5 years ago
pl.yml	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
pt-BR.yml	New Crowdin translations (#11305)	5 years ago
pt.yml	New Crowdin translations (#11305)	5 years ago
ro.yml	New Crowdin translations (#11305)	5 years ago
ru.yml	New Crowdin translations (#11596)	5 years ago
simple_form.ar.yml	New Crowdin translations (#11305)	5 years ago
simple_form.ast.yml	…
simple_form.bg.yml	…
simple_form.bn.yml	…
simple_form.ca.yml	New Crowdin translations (#11305)	5 years ago
simple_form.co.yml	New Crowdin translations (#11305)	5 years ago
simple_form.cs.yml	New Crowdin translations (#11305)	5 years ago
simple_form.cy.yml	New Crowdin translations (#11153)	5 years ago
simple_form.da.yml	…
simple_form.de.yml	New Crowdin translations (#11305)	5 years ago
simple_form.el.yml	New Crowdin translations (#11305)	5 years ago
simple_form.en.yml	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
simple_form.en_GB.yml	…
simple_form.eo.yml	New Crowdin translations (#11305)	5 years ago
simple_form.es.yml	New Crowdin translations (#11305)	5 years ago
simple_form.et.yml	New Crowdin translations (#11305)	5 years ago
simple_form.eu.yml	New Crowdin translations (#11305)	5 years ago
simple_form.fa.yml	New Crowdin translations (#11305)	5 years ago
simple_form.fi.yml	…
simple_form.fr.yml	…
simple_form.gl.yml	New Crowdin translations (#11305)	5 years ago
simple_form.he.yml	…
simple_form.hr.yml	…
simple_form.hu.yml	New Crowdin translations (#11305)	5 years ago
simple_form.hy.yml	…
simple_form.id.yml	…
simple_form.io.yml	…
simple_form.it.yml	New Crowdin translations (#11593)	5 years ago
simple_form.ja.yml	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
simple_form.ka.yml	…
simple_form.kk.yml	…
simple_form.ko.yml	New Crowdin translations (#11305)	5 years ago
simple_form.lt.yml	…
simple_form.lv.yml	…
simple_form.ms.yml	…
simple_form.nl.yml	…
simple_form.no.yml	…
simple_form.oc.yml	New Crowdin translations (#11305)	5 years ago
simple_form.pl.yml	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
simple_form.pt-BR.yml	…
simple_form.pt.yml	…
simple_form.ro.yml	…
simple_form.ru.yml	New Crowdin translations (#11596)	5 years ago
simple_form.sk.yml	New Crowdin translations (#11305)	5 years ago
simple_form.sl.yml	New Crowdin translations (#11305)	5 years ago
simple_form.sq.yml	…
simple_form.sr-Latn.yml	…
simple_form.sr.yml	…
simple_form.sv.yml	…
simple_form.ta.yml	…
simple_form.te.yml	…
simple_form.th.yml	New Crowdin translations (#11305)	5 years ago
simple_form.tr.yml	…
simple_form.uk.yml	New Crowdin translations (#11305)	5 years ago
simple_form.zh-CN.yml	New Crowdin translations (#11305)	5 years ago
simple_form.zh-HK.yml	…
simple_form.zh-TW.yml	…
sk.yml	New Crowdin translations (#11596)	5 years ago
sl.yml	New Crowdin translations (#11305)	5 years ago
sq.yml	New Crowdin translations (#11305)	5 years ago
sr-Latn.rb	…
sr-Latn.yml	New Crowdin translations (#11153)	5 years ago
sr.rb	…
sr.yml	New Crowdin translations (#11305)	5 years ago
sv.yml	New Crowdin translations (#11305)	5 years ago
ta.yml	…
te.yml	…
th.yml	New Crowdin translations (#11596)	5 years ago
tr.yml	New Crowdin translations (#11305)	5 years ago
uk.yml	New Crowdin translations (#11305)	5 years ago
zh-CN.yml	New Crowdin translations (#11305)	5 years ago
zh-HK.yml	New Crowdin translations (#11305)	5 years ago
zh-TW.yml	New Crowdin translations (#11305)	5 years ago