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 dcded13a99 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - .github/ISSUE_TEMPLATE/bug_report.md Took our version. - CONTRIBUTING.md Updated the embedded copy of upstream's version. - README.md Took our version. - app/policies/status_policy.rb Not a real conflict, took code from both. - app/views/layouts/embedded.html.haml Added upstream's changes (dns-prefetch) and fixed `%body.embed` - app/views/settings/preferences/show.html.haml Reverted some of upstream changes, as we have a page dedicated for flavours and skins. - config/initializers/content_security_policy.rb Kept our version of the CSP. - config/initializers/doorkeeper.rb Not a real conflict, took code from both.		6 years ago
..
locale-data	…
ar.json	…
ast.json	…
bg.json	…
ca.json	…
co.json	…
cs.json	…
cy.json	…
da.json	…
de.json	…
defaultMessages.json	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
el.json	…
en.json	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
eo.json	…
es.json	…
eu.json	…
fa.json	…
fi.json	…
fr.json	…
gl.json	…
he.json	…
hr.json	…
hu.json	…
hy.json	…
id.json	…
index.js	…
io.json	…
it.json	…
ja.json	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
ka.json	…
ko.json	…
nl.json	…
no.json	…
oc.json	…
pl.json	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
pt-BR.json	…
pt.json	…
ro.json	…
ru.json	…
sk.json	…
sl.json	…
sr-Latn.json	…
sr.json	…
sv.json	…
ta.json	…
te.json	…
th.json	…
tr.json	…
uk.json	…
whitelist_ar.json	…
whitelist_ast.json	…
whitelist_bg.json	…
whitelist_ca.json	…
whitelist_co.json	…
whitelist_cs.json	…
whitelist_cy.json	…
whitelist_da.json	…
whitelist_de.json	…
whitelist_el.json	…
whitelist_en.json	…
whitelist_eo.json	…
whitelist_es.json	…
whitelist_eu.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_ka.json	…
whitelist_ko.json	…
whitelist_nl.json	…
whitelist_no.json	…
whitelist_oc.json	…
whitelist_pl.json	…
whitelist_pt-BR.json	…
whitelist_pt.json	…
whitelist_ro.json	…
whitelist_ru.json	…
whitelist_sk.json	…
whitelist_sl.json	…
whitelist_sr-Latn.json	…
whitelist_sr.json	…
whitelist_sv.json	…
whitelist_ta.json	…
whitelist_te.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	…
zh-HK.json	…
zh-TW.json	…