Merge remote-tracking branch 'origin/master' · phetsims/binder@bd80857 · GitHub

Commit

Merge remote-tracking branch 'origin/master'

Browse files

# Conflicts:
#	react-binder/public/img/phet.png
#	react-binder/src/pages/index/index.css
#	react-binder/src/pages/index/index.js

Loading branch information

chrisklus committed Jul 23, 2019

2 parents 104b6b6 + 2b7f7f3 commit bd80857