Joe Skeen 89c5323cda Merge branch 'master' of https://github.com/borisyankov/DefinitelyTyped into ui-grid-generic ...

# By Ilya Mochalov (24) and others
# Via Masahiro Wakame (87) and others
* 'master' of https://github.com/borisyankov/DefinitelyTyped: (189 commits)
  update npm-shrinkwrap.json
  update dt-tester
  fix mapbox/mapbox.d.ts
  Fix issue #5854
  lodash: changed _.pull() method
  lodash: changed _.without() method
  findup-sync: Update to v0.3.0 and include cwd property in options.
  Adding tests file and adjusting meshblu definitions
  Make a generic base version of HTMLAttributes and DOMAttributes to allow for components that pass all remaining properties to an underlying HTML element.
  lodash: added _.takeRight() method
  meshblu 1.30.1 definitions
  node-cache: added tests
  node-cache: added definitions
  Added missing gridHeight property
  Add typings and test code from Pusher Documentation (https://pusher.com/docs)
  Add version
  Provide pusher-js with typings
  Add pusher-js
  Update pubsubjs to latest version, and add exported module name
  Update reference to Q definitions
  ...

Conflicts:
	ui-grid/ui-grid-tests.ts
	ui-grid/ui-grid.d.ts

2015-09-23 08:35:30 -06:00

..

ui-grid-tests.ts

Merge branch 'master' of https://github.com/borisyankov/DefinitelyTyped into ui-grid-generic

2015-09-23 08:35:30 -06:00

ui-grid.d.ts

Merge branch 'master' of https://github.com/borisyankov/DefinitelyTyped into ui-grid-generic

2015-09-23 08:35:30 -06:00