Skip to content

Commit

Permalink
chore: merge main to develop
Browse files Browse the repository at this point in the history
  • Loading branch information
github-actions committed Jan 8, 2025
2 parents be1ae10 + a76159e commit 7a335e8
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 14 deletions.
18 changes: 9 additions & 9 deletions THIRD_PARTY_NOTICES
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ This project incorporates components from the projects listed below. The origina
125. [email protected] (webpack-contrib/style-loader)
126. [email protected] (webpack-contrib/css-loader)
127. @camunda/[email protected] (git+https://github.com/camunda/form-playground.git)
128. [email protected].1 (https://github.com/camunda/camunda-bpmn-js)
128. [email protected].2 (https://github.com/camunda/camunda-bpmn-js)
129. [email protected] (https://github.com/camunda/camunda-dmn-js)
130. @camunda/[email protected] (https://github.com/camunda/linting)
131. @ibm/[email protected] (https://github.com/ibm/plex.git)
Expand Down Expand Up @@ -181,8 +181,8 @@ This project incorporates components from the projects listed below. The origina
174. [email protected] (git+https://github.com/focus-trap/focus-trap.git)
175. [email protected] (git+https://github.com/focus-trap/tabbable.git)
176. [email protected] (https://github.com/bpmn-io/bpmn-js-properties-panel)
177. [email protected].1 (https://github.com/bpmn-io/bpmn-js)
178. [email protected].3 (https://github.com/bpmn-io/diagram-js)
177. [email protected].2 (https://github.com/bpmn-io/bpmn-js)
178. [email protected].4 (https://github.com/bpmn-io/diagram-js)
179. [email protected] (https://github.com/bpmn-io/ids)
180. @bpmn-io/[email protected] (git+https://github.com/bpmn-io/extract-process-variables.git)
181. [email protected] (sindresorhus/array-move)
Expand Down Expand Up @@ -9033,7 +9033,7 @@ THE SOFTWARE.
END OF @camunda/[email protected] NOTICES AND INFORMATION


%% [email protected].1 NOTICES AND INFORMATION BEGIN HERE
%% [email protected].2 NOTICES AND INFORMATION BEGIN HERE
==========================================
The MIT License (MIT)

Expand All @@ -9057,7 +9057,7 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
==========================================
END OF [email protected].1 NOTICES AND INFORMATION
END OF [email protected].2 NOTICES AND INFORMATION


%% [email protected] NOTICES AND INFORMATION BEGIN HERE
Expand Down Expand Up @@ -10471,7 +10471,7 @@ THE SOFTWARE.
END OF [email protected] NOTICES AND INFORMATION


%% [email protected].1 NOTICES AND INFORMATION BEGIN HERE
%% [email protected].2 NOTICES AND INFORMATION BEGIN HERE
==========================================
Copyright (c) 2014-present Camunda Services GmbH

Expand All @@ -10498,10 +10498,10 @@ TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR TH
OR OTHER DEALINGS IN THE SOFTWARE.

==========================================
END OF [email protected].1 NOTICES AND INFORMATION
END OF [email protected].2 NOTICES AND INFORMATION


%% [email protected].3 NOTICES AND INFORMATION BEGIN HERE
%% [email protected].4 NOTICES AND INFORMATION BEGIN HERE
==========================================
The MIT License (MIT)

Expand All @@ -10525,7 +10525,7 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
==========================================
END OF [email protected].3 NOTICES AND INFORMATION
END OF [email protected].4 NOTICES AND INFORMATION


%% [email protected] NOTICES AND INFORMATION BEGIN HERE
Expand Down
2 changes: 1 addition & 1 deletion app/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "camunda-modeler",
"version": "5.31.0-rc.0",
"version": "5.31.0",
"description": "Camunda Modeler for BPMN, DMN and CMMN, based on bpmn.io",
"private": true,
"main": "prod.js",
Expand Down
2 changes: 1 addition & 1 deletion client/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "camunda-modeler-client",
"version": "5.31.0-rc.0",
"version": "5.31.0",
"description": "Camunda Modeler client application",
"private": true,
"license": "MIT",
Expand Down
2 changes: 1 addition & 1 deletion lerna.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
"$schema": "node_modules/lerna/schemas/lerna-schema.json",
"version": "5.31.0-rc.0"
"version": "5.31.0"
}
4 changes: 2 additions & 2 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 7a335e8

Please sign in to comment.