Merge branch 'master' into mixins

Browse Source

# Conflicts:
#	src/components/Select.vue
#	src/mixins/pointerScroll.js

...

This commit is contained in:

Jeff Sagal

2016-06-03 11:00:25 -07:00

parent 3c668fd45e 50b52b8f9d

commit 699e5de0d7

7 changed files with 35 additions and 32 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

src/index.js