Merge remote-tracking branch 'upstream/master' into best-score
author Tim Petricola
()
committer Tim Petricola
()
commit 77654452a7e70a249cba0a22a3f3ac06ca2296ec
tree 0a19fdc9104746e46edd7e0332033b2f2662c233
parent d6da8d99251266445beaead0da79f0085756c054
parent 39ba3a986f2b67c615a5c92355c04a5450873c94
Merge remote-tracking branch 'upstream/master' into best-score

Conflicts:
index.html
js/application.js
js/html_actuator.js
README.md
favicon.ico [ new file with mode 0644 ]
index.html
js/animframe_polyfill.js [ new file with mode 0644 ]
js/application.js
js/keyboard_input_manager.js
style/helpers.scss
style/main.css
style/main.scss
comments