Commit Graph

2 Commits (e48d0662a947184f350e176be0acd6db238cc6d1)

Author SHA1 Message Date
David Schnur 3035aaaeca Merge branch 'master' into 0.9-work
Conflicts:
	component.json
	flot.jquery.json
	jquery.flot.js
	jquery.flot.pie.js
	jquery.flot.resize.js
	lib/jquery.colorhelpers.js
	package.json
13 years ago
Nick Schonning 4e66f981e2 Move non-Bower third party code under lib 13 years ago