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
..
index.html	Merge branch 'release/v1.2.0-rc2'	2016-07-30 00:38:46 -03:00