Paul van Brenk
|
68eea6297d
|
Merge branch 'master' into types-2.0-20160816
# Conflicts:
# acl/index.d.ts
# anydb-sql-migrations/anydb-sql-migrations.d.ts
# asana/asana.d.ts
# blue-tape/blue-tape-tests.ts
# bluebird-retry/bluebird-retry-tests.ts
# bluebird-retry/bluebird-retry.d.ts
# bluebird/index.d.ts
# bookshelf/bookshelf.d.ts
# consolidate/consolidate.d.ts
# documentdb/documentdb.d.ts
# fs-extra-promise/fs-extra-promise.d.ts
# graphene-pk11/graphene-pk11.d.ts
# inline-css/inline-css.d.ts
# inversify/index.d.ts
# java/java-tests.ts
# karma/karma.d.ts
# knex/knex.d.ts
# koa-router/koa-router.d.ts
# libxmljs/libxmljs-tests.ts
# lru-cache/lru-cache.d.ts
# mz/index.d.ts
# node-mysql-wrapper/node-mysql-wrapper-tests.ts
# node-mysql-wrapper/node-mysql-wrapper.d.ts
# nodemailer/nodemailer.d.ts
# pify/pify-tests.ts
# project-oxford/project-oxford-tests.ts
# project-oxford/project-oxford.d.ts
# react-router/react-router-tests.tsx
# react-scroll/react-scroll.d.ts
# redlock/redlock.d.ts
# request-promise/index.d.ts
# rethinkdb/rethinkdb.d.ts
# sequelize/sequelize.d.ts
# stamplay-js-sdk/index.d.ts
# stripe-node/stripe-node.d.ts
# umzug/umzug.d.ts
|
2016-08-16 13:56:22 -07:00 |
|