Merge branch 'master' into bugfix/422

# Conflicts:
#	README.md
#	dist/gridstack.js
#	dist/gridstack.min.js
#	dist/gridstack.min.map
#	src/gridstack.js
This commit is contained in:
Dylan Weiss 2016-08-17 10:55:22 -04:00
commit 042ba6a887

Diff content is not available