Skip to content

Commit 31948e0

Browse files
Merge branch 'develop' of github.com:ProcessMaker/processmaker into observation/FOUR-26310
2 parents 013b226 + 8d90004 commit 31948e0

File tree

3 files changed

+5
-8
lines changed

3 files changed

+5
-8
lines changed

composer.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "processmaker/processmaker",
3-
"version": "4.15.7+beta-1",
3+
"version": "4.15.7+beta-2",
44
"description": "BPM PHP Software",
55
"keywords": [
66
"php bpm processmaker"
@@ -106,7 +106,7 @@
106106
"Gmail"
107107
],
108108
"processmaker": {
109-
"build": "8c08f440",
109+
"build": "fd8586e5",
110110
"cicd-enabled": true,
111111
"custom": {
112112
"package-ellucian-ethos": "1.19.7",
@@ -160,7 +160,7 @@
160160
"package-data-sources": "1.34.1",
161161
"package-decision-engine": "1.16.1",
162162
"package-dynamic-ui": "1.28.2",
163-
"package-email-start-event": "1.0.3",
163+
"package-email-start-event": "1.0.4",
164164
"package-files": "1.23.0",
165165
"package-googleplaces": "1.12.0",
166166
"package-photo-video": "1.6.1",
@@ -229,4 +229,4 @@
229229
"tbachert/spi": true
230230
}
231231
}
232-
}
232+
}

composer.lock

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

resources/js/processes/modeler/components/inspector/StageItem.vue

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,6 @@
1313
@input="onInput"
1414
@paste="onPaste"
1515
>
16-
<small class="tw-text-gray-500 tw-text-xs">
17-
{{ localName.length }}/200 {{ t('characters') }}
18-
</small>
1916
</template>
2017
<template v-else>
2118
<div

0 commit comments

Comments
 (0)