Skip to content

Commit 0db5c47

Browse files
Merge pull request #47 from parallaxinc/develop
Update local develop branch
2 parents 378da79 + 2cb3e57 commit 0db5c47

File tree

9 files changed

+5557
-173
lines changed

9 files changed

+5557
-173
lines changed

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,9 @@ node_modules
1010
#Compressed files
1111
*_compressed*.js
1212

13+
# Webpack targets
14+
build
15+
dist
1316

1417
# MacOS files
1518
.DS_Store

index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ <h4 class="modal-title w-100" id="licenseLabel">BlocklyProp Solo License</h4>
156156
<li><a onclick="showLicense()">License</a></li>
157157
<li>
158158
<a href="http://www.parallax.com" target="_blank">
159-
v1.4.2.4 Parallax &copy; 2015 - <span id="footer_copyright"></span></a>
159+
v1.4.2 Parallax &copy; 2015 - <span id="footer_copyright"></span></a>
160160
</li>
161161
</ul>
162162
</div>

0 commit comments

Comments
 (0)