Merge branch 'master' into bugfix/staticGrid

Browse source

# Conflicts:
#	dist/gridstack.min.map

...

This commit is contained in:

d 2016-02-18 16:52:57 -05:00

parent ca800454f1 1364e180e1

commit 03ca75717c

4 changed files with 4 additions and 4 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

2

dist/gridstack.min.map vendored

View file

File diff suppressed because one or more lines are too long