Skip to content

Commit ce112f0

Browse files
authored
Merge pull request #1054 from zfi/demo
Releasing build 410
2 parents 3c7049b + 1fe1f4a commit ce112f0

File tree

2 files changed

+7
-11
lines changed

2 files changed

+7
-11
lines changed

src/main/resources/com/parallax/server/blocklyprop/internationalization/translations.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ footer.clientdownloadlink = BlocklyProp-client
3030
# Application version numbers.
3131
application.major = 0
3232
application.minor = 96
33-
application.build = 383
33+
application.build = 410
3434

3535
html.content_missing = Content missing
3636

src/main/webapp/frame/framec.jsp

+6-10
Original file line numberDiff line numberDiff line change
@@ -442,16 +442,12 @@
442442
</value>
443443
</category>
444444
<category name="<fmt:message key="category.communicate" />" include="activity-board,flip,other" colour="340">
445-
<c:choose>
446-
<c:when test="${experimental == true}">
447-
<category name="<fmt:message key="category.communicate.graphing" />" include="activity-board,flip,other">
448-
<block type="graph_settings">
449-
<field name="XAXIS">40,S</field>
450-
</block>
451-
<block type="graph_output"></block>
452-
</category>
453-
</c:when>
454-
</c:choose>
445+
<category name="<fmt:message key="category.communicate.graphing" />" include="activity-board,flip,other">
446+
<block type="graph_settings">
447+
<field name="XAXIS">40,S</field>
448+
</block>
449+
<block type="graph_output"></block>
450+
</category>
455451
<category name="<fmt:message key="category.communicate.oled" />">
456452
<block type="oled_initialize"></block>
457453
<block type="oled_font_loader"></block>

0 commit comments

Comments
 (0)