Commit graph

2 commits

Author SHA1 Message Date
Mohamed Hegazy 13a6487cd3 Merge branch 'master' into es6Typings
Conflicts:
	tests/baselines/reference/arrayTypeOfTypeOf.errors.txt
	tests/baselines/reference/redefineArray.errors.txt
2014-11-10 16:46:02 -08:00
Daniel Rosenwasser c0893e153f Added tests and baselines for templates. 2014-10-23 15:06:05 -07:00