mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-11-17 04:13:01 +00:00
eee36267d6
Conflicts: - `app/javascript/mastodon/locales/ja.json`: Upstream change too close to a glitch-soc-specific string. The glitch-soc-specific string should not have been in this file, so it has been moved to `app/javascript/flavours/glitch/locales/ja.js`. - `app/javascript/packs/public.js`: Upstream refactored a part, that as usual is split and duplicated in various pack files. Updated those pack files accordingly. - `app/views/layouts/application.html.haml`: Upstream fixed custom.css path in a different way than we did, went with upstream's change. |
||
|---|---|---|
| .. | ||
| af.js | ||
| ar.js | ||
| ast.js | ||
| bg.js | ||
| bn.js | ||
| br.js | ||
| ca.js | ||
| ckb.js | ||
| co.js | ||
| cs.js | ||
| cy.js | ||
| da.js | ||
| de.js | ||
| el.js | ||
| en.js | ||
| eo.js | ||
| es-AR.js | ||
| es-MX.js | ||
| es.js | ||
| et.js | ||
| eu.js | ||
| fa.js | ||
| fi.js | ||
| fr.js | ||
| ga.js | ||
| gd.js | ||
| gl.js | ||
| he.js | ||
| hi.js | ||
| hr.js | ||
| hu.js | ||
| hy.js | ||
| id.js | ||
| io.js | ||
| is.js | ||
| it.js | ||
| ja.js | ||
| ka.js | ||
| kab.js | ||
| kk.js | ||
| kn.js | ||
| ko.js | ||
| ku.js | ||
| kw.js | ||
| lt.js | ||
| lv.js | ||
| mk.js | ||
| ml.js | ||
| mr.js | ||
| ms.js | ||
| nl.js | ||
| nn.js | ||
| no.js | ||
| oc.js | ||
| pa.js | ||
| pl.js | ||
| pt-BR.js | ||
| pt-PT.js | ||
| ro.js | ||
| ru.js | ||
| sa.js | ||
| sc.js | ||
| si.js | ||
| sk.js | ||
| sl.js | ||
| sq.js | ||
| sr-Latn.js | ||
| sr.js | ||
| sv.js | ||
| szl.js | ||
| ta.js | ||
| tai.js | ||
| te.js | ||
| th.js | ||
| tr.js | ||
| tt.js | ||
| ug.js | ||
| uk.js | ||
| ur.js | ||
| vi.js | ||
| zgh.js | ||
| zh-CN.js | ||
| zh-HK.js | ||
| zh-TW.js | ||