Skip to content

Commit

Permalink
Merge branch 'i18n-de/jsonata' of https://github.com/heikokue/node-red
Browse files Browse the repository at this point in the history
…into i18n-de/jsonata

# Conflicts:
#	packages/node_modules/@node-red/editor-client/locales/de/jsonata.json
  • Loading branch information
heikokue committed Dec 28, 2020
2 parents 42b6da8 + 14ca7c0 commit b5a123a
Showing 0 changed files with 0 additions and 0 deletions.

0 comments on commit b5a123a

Please sign in to comment.