Skip to content
Snippets Groups Projects
Commit 7f13afbb authored by Vincent Garreau's avatar Vincent Garreau
Browse files

Merge branch 'dev'

Conflicts:
	README.md
	bower.json
	demo/js/app.js
	particles.js
	particles.min.js
parents f9ea2cf4 c2f2f55e
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment