Merge branch 'dev' of https://github.com/evancz/Elm into dev
Conflicts:
libraries/Graphics/Collage.elm
runtime/Render/Collage.js
runtime/Render/Element.js
commitfa9d3bf13274227a9bd3c40879d8dd3a96350159
authorevancz <info@elm-lang.org>
dateThu 21 Mar 2013, 02:38 (14 years ago)
parent4b8c979794b7f2