ncd-fe

Files

Curtis 675f580d60 Resolve merge conflicts

Merge branch 'develop' into 'translate_public_header'

# Conflicts:
#   app/soapbox/locales/ar.json
#   app/soapbox/locales/ast.json
#   app/soapbox/locales/bg.json
#   app/soapbox/locales/bn.json
#   app/soapbox/locales/br.json
#   app/soapbox/locales/ca.json
#   app/soapbox/locales/co.json
#   app/soapbox/locales/cs.json
#   app/soapbox/locales/cy.json
#   app/soapbox/locales/da.json
#   app/soapbox/locales/de.json
#   app/soapbox/locales/defaultMessages.json
#   app/soapbox/locales/el.json
#   app/soapbox/locales/en.json
#   app/soapbox/locales/eo.json
#   app/soapbox/locales/es-AR.json
#   app/soapbox/locales/es.json
#   app/soapbox/locales/et.json
#   app/soapbox/locales/eu.json
#   app/soapbox/locales/fa.json
#   app/soapbox/locales/fi.json
#   app/soapbox/locales/fr.json
#   app/soapbox/locales/ga.json
#   app/soapbox/locales/gl.json
#   app/soapbox/locales/he.json
#   app/soapbox/locales/hi.json
#   app/soapbox/locales/hr.json
#   app/soapbox/locales/hu.json
#   app/soapbox/locales/hy.json
#   app/soapbox/locales/id.json
#   app/soapbox/locales/io.json
#   app/soapbox/locales/it.json
#   app/soapbox/locales/ja.json
#   app/soapbox/locales/ka.json
#   app/soapbox/locales/kk.json
#   app/soapbox/locales/ko.json
#   app/soapbox/locales/lt.json
#   app/soapbox/locales/lv.json
#   app/soapbox/locales/mk.json
#   app/soapbox/locales/ms.json
#   app/soapbox/locales/nl.json
#   app/soapbox/locales/nn.json
#   app/soapbox/locales/no.json
#   app/soapbox/locales/oc.json
#   app/soapbox/locales/pl.json
#   app/soapbox/locales/pt-BR.json
#   app/soapbox/locales/pt.json
#   app/soapbox/locales/ro.json
#   app/soapbox/locales/ru.json
#   app/soapbox/locales/sk.json
#   app/soapbox/locales/sl.json
#   app/soapbox/locales/sq.json
#   app/soapbox/locales/sr-Latn.json
#   app/soapbox/locales/sr.json
#   app/soapbox/locales/sv.json
#   app/soapbox/locales/ta.json
#   app/soapbox/locales/te.json
#   app/soapbox/locales/th.json
#   app/soapbox/locales/tr.json
#   app/soapbox/locales/uk.json
#   app/soapbox/locales/zh-CN.json
#   app/soapbox/locales/zh-HK.json
#   app/soapbox/locales/zh-TW.json

2020-08-13 22:28:27 +00:00