Files
DefinitelyTyped/log4js
Daniel Rosenwasser dee433d5d1 Merge branch 'handleExtraObjectLiteralProperties2' into handleExtraObjectLiteralProperties
Conflicts:
	jquery.uniform/jquery.uniform.d.ts
	log4js/log4js.d.ts
2015-08-17 14:11:10 -07:00
..