Merge remote-tracking branch 'origin/dev' into dev
commit a25952d49db38f460a682c862c0bf82b39b34043
2 parents 979c3d4 + d5e1d11
@Mat Groves Mat Groves authored on 9 Dec 2015
Showing 2 changed files
View
src/core/particles/ParticleContainer.js
View
src/core/text/Text.js