Thibaut Girka 36393e1d2b Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: app/views/layouts/application.html.haml Edited: app/helpers/application_helper.rb app/views/admin/domain_blocks/new.html.haml Conflict wasn't really one, just two changes too close to one another. Edition was to adapt the class names for themes to class names for skins and flavours. Also edited app/views/admin/domain_blocks/new.html.haml to strip the duplicate admin pack inclusion thing.		2018-08-26 14:23:24 +02:00
..
ar.json	Weblate translations (2018-08-25) (#8420)	2018-08-25 13:27:56 +02:00
ast.json	Weblate translations (2018-08-25) (#8420)	2018-08-25 13:27:56 +02:00
bg.json	Weblate translations (2018-08-25) (#8420)	2018-08-25 13:27:56 +02:00
ca.json	Weblate translations (2018-08-25) (#8420)	2018-08-25 13:27:56 +02:00
co.json	Weblate translations (2018-08-25) (#8420)	2018-08-25 13:27:56 +02:00
cs.json	Weblate translations (2018-08-25) (#8420)	2018-08-25 13:27:56 +02:00
da.json	Weblate translations (2018-08-25) (#8420)	2018-08-25 13:27:56 +02:00
de.json	Weblate translations (2018-08-25) (#8420)	2018-08-25 13:27:56 +02:00
defaultMessages.json	Merge branch 'master' into glitch-soc/merge-upstream	2018-08-26 14:23:24 +02:00
el.json	Weblate translations (2018-08-25) (#8420)	2018-08-25 13:27:56 +02:00
en.json	Merge branch 'master' into glitch-soc/merge-upstream	2018-08-26 14:23:24 +02:00
eo.json	Weblate translations (2018-08-25) (#8420)	2018-08-25 13:27:56 +02:00
es.json	Weblate translations (2018-08-25) (#8420)	2018-08-25 13:27:56 +02:00
eu.json	Weblate translations (2018-08-25) (#8420)	2018-08-25 13:27:56 +02:00
fa.json	Weblate translations (2018-08-25) (#8420)	2018-08-25 13:27:56 +02:00
fi.json	Weblate translations (2018-08-25) (#8420)	2018-08-25 13:27:56 +02:00
fr.json	Weblate translations (2018-08-25) (#8420)	2018-08-25 13:27:56 +02:00
gl.json	Weblate translations (2018-08-25) (#8420)	2018-08-25 13:27:56 +02:00
he.json	Weblate translations (2018-08-25) (#8420)	2018-08-25 13:27:56 +02:00
hr.json	Weblate translations (2018-08-25) (#8420)	2018-08-25 13:27:56 +02:00
hu.json	Weblate translations (2018-08-25) (#8420)	2018-08-25 13:27:56 +02:00
hy.json	Weblate translations (2018-08-25) (#8420)	2018-08-25 13:27:56 +02:00
id.json	Weblate translations (2018-08-25) (#8420)	2018-08-25 13:27:56 +02:00
index.js	Finalized theme loading and stuff	2017-11-20 22:13:37 -08:00
io.json	Weblate translations (2018-08-25) (#8420)	2018-08-25 13:27:56 +02:00
it.json	Weblate translations (2018-08-25) (#8420)	2018-08-25 13:27:56 +02:00
ja.json	Merge branch 'master' into glitch-soc/merge-upstream	2018-08-26 14:23:24 +02:00
ka.json	Weblate translations (2018-08-25) (#8420)	2018-08-25 13:27:56 +02:00
ko.json	Weblate translations (2018-08-25) (#8420)	2018-08-25 13:27:56 +02:00
nl.json	Weblate translations (2018-08-25) (#8420)	2018-08-25 13:27:56 +02:00
no.json	Weblate translations (2018-08-25) (#8420)	2018-08-25 13:27:56 +02:00
oc.json	Weblate translations (2018-08-25) (#8420)	2018-08-25 13:27:56 +02:00
pl.json	Merge branch 'master' into glitch-soc/merge-upstream	2018-08-26 14:23:24 +02:00
pt-BR.json	Weblate translations (2018-08-25) (#8420)	2018-08-25 13:27:56 +02:00
pt.json	Weblate translations (2018-08-25) (#8420)	2018-08-25 13:27:56 +02:00
ru.json	Weblate translations (2018-08-25) (#8420)	2018-08-25 13:27:56 +02:00
sk.json	Weblate translations (2018-08-25) (#8420)	2018-08-25 13:27:56 +02:00
sl.json	Weblate translations (2018-08-25) (#8420)	2018-08-25 13:27:56 +02:00
sr-Latn.json	Weblate translations (2018-08-25) (#8420)	2018-08-25 13:27:56 +02:00
sr.json	Weblate translations (2018-08-25) (#8420)	2018-08-25 13:27:56 +02:00
sv.json	Weblate translations (2018-08-25) (#8420)	2018-08-25 13:27:56 +02:00
te.json	Weblate translations (2018-08-25) (#8420)	2018-08-25 13:27:56 +02:00
th.json	Weblate translations (2018-08-25) (#8420)	2018-08-25 13:27:56 +02:00
tr.json	Weblate translations (2018-08-25) (#8420)	2018-08-25 13:27:56 +02:00
uk.json	Weblate translations (2018-08-25) (#8420)	2018-08-25 13:27:56 +02:00
whitelist_ar.json	…
whitelist_ast.json	Weblate translations (2018-07-25) (#8065)	2018-07-24 20:47:13 +02:00
whitelist_bg.json	…
whitelist_ca.json	…
whitelist_co.json	Add Corsican localization (#7390)	2018-05-07 01:34:19 +02:00
whitelist_cs.json	Weblate translations (2018-07-11) (#7992)	2018-07-11 01:14:38 +02:00
whitelist_da.json	Weblate translations (2018-07-11) (#7992)	2018-07-11 01:14:38 +02:00
whitelist_de.json	…
whitelist_el.json	Add el and te (#7332)	2018-05-03 15:54:10 +02:00
whitelist_en.json	…
whitelist_eo.json	…
whitelist_es.json	…
whitelist_eu.json	Add el and te (#7332)	2018-05-03 15:54:10 +02:00
whitelist_fa.json	…
whitelist_fi.json	…
whitelist_fr.json	…
whitelist_gl.json	Weblate translations (#5946)	2017-12-09 15:35:22 +01:00
whitelist_he.json	…
whitelist_hr.json	…
whitelist_hu.json	…
whitelist_hy.json	Weblate translations (#6323)	2018-01-22 14:20:58 +01:00
whitelist_id.json	…
whitelist_io.json	…
whitelist_it.json	…
whitelist_ja.json	…
whitelist_ka.json	Add Georgian language translation (#8250)	2018-08-18 01:00:01 +09:00
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	Add Japanese translations #5997, #6003, #6004, #6071, #6099, #6125 and #6132 (#6167)	2018-01-03 21:00:39 +09:00
whitelist_sl.json	Weblate translations (2018-05-10) (#7438)	2018-05-10 14:48:26 +02:00
whitelist_sr-Latn.json	Fix RFC 5646 Regular Expression (#6190)	2018-01-05 04:43:50 +01:00
whitelist_sr.json	Add Japanese translations #5997, #6003, #6004, #6071, #6099, #6125 and #6132 (#6167)	2018-01-03 21:00:39 +09:00
whitelist_sv.json	Add Japanese translations (#5810)	2017-11-25 03:39:57 +01:00
whitelist_te.json	Add el and te (#7332)	2018-05-03 15:54:10 +02:00
whitelist_th.json	…
whitelist_tr.json	…
whitelist_uk.json	…
whitelist_zh-CN.json	…
whitelist_zh-HK.json	…
whitelist_zh-TW.json	…
zh-CN.json	Weblate translations (2018-08-25) (#8420)	2018-08-25 13:27:56 +02:00
zh-HK.json	Weblate translations (2018-08-25) (#8420)	2018-08-25 13:27:56 +02:00
zh-TW.json	Weblate translations (2018-08-25) (#8420)	2018-08-25 13:27:56 +02:00