Lukas Zech 035b1e61a2 Merge remote-tracking branch 'upstream/master' ...

Conflicts:
	jasmine-expect/index.d.ts

2017-03-14 07:58:35 +01:00

..

index.d.ts

Merge remote-tracking branch 'upstream/master'

2017-03-14 07:58:35 +01:00

jasmine-expect-tests.ts

…

tsconfig.json

…