mirror of
https://github.com/node-red/node-red.git
synced 2025-03-01 10:36:34 +00:00
Merge branch 'dev' into repackage
This commit is contained in:
1
packages/node_modules/@node-red/editor-api/lib/editor/locales/en-US/editor.json
generated
vendored
1
packages/node_modules/@node-red/editor-api/lib/editor/locales/en-US/editor.json
generated
vendored
@@ -587,6 +587,7 @@
|
||||
"pullUnrelatedHistory": "<p>The remote has an unrelated history of commits.</p><p>Are you sure you want to pull the changes into your local repository?</p>",
|
||||
"pullChanges": "Pull changes",
|
||||
"history": "history",
|
||||
"projectHistory": "Project History",
|
||||
"daysAgo": "__count__ day ago",
|
||||
"daysAgo_plural": "__count__ days ago",
|
||||
"hoursAgo": "__count__ hour ago",
|
||||
|
1
packages/node_modules/@node-red/editor-api/lib/editor/locales/ja/editor.json
generated
vendored
1
packages/node_modules/@node-red/editor-api/lib/editor/locales/ja/editor.json
generated
vendored
@@ -585,6 +585,7 @@
|
||||
"pullUnrelatedHistory": "<p>リモートに関連のないコミット履歴があります。</p><p>本当に変更をプルしてローカルリポジトリに反映しますか?</p>",
|
||||
"pullChanges": "プル変更",
|
||||
"history": "履歴",
|
||||
"projectHistory": "プロジェクト履歴",
|
||||
"daysAgo": "__count__ 日前",
|
||||
"daysAgo_plural": "__count__ 日前",
|
||||
"hoursAgo": "__count__ 時間前",
|
||||
|
2
packages/node_modules/@node-red/editor-api/package.json
generated
vendored
2
packages/node_modules/@node-red/editor-api/package.json
generated
vendored
@@ -22,7 +22,7 @@
|
||||
"express": "4.16.3",
|
||||
"memorystore": "1.6.0",
|
||||
"mime": "1.4.1",
|
||||
"mustache": "2.3.1",
|
||||
"mustache": "2.3.2",
|
||||
"oauth2orize": "1.11.0",
|
||||
"passport-http-bearer": "1.0.1",
|
||||
"passport-oauth2-client-password": "0.1.2",
|
||||
|
Reference in New Issue
Block a user