Commit Graph

2 Commits

Author SHA1 Message Date
CJ Patoilo
26da7152e4 Merge branch 'release/v1.2.0-rc2'
# Conflicts:
#	.github/contributing.md
#	examples/index.html
2016-07-30 00:38:46 -03:00
CJ Patoilo
83dff058fe Renamed the demo folder to examples 2016-07-25 03:17:50 -03:00