Nathan Shively-Sanders 983c93531a Merge branch 'types-2.0' into types-merge-20161118

2016-11-21 16:16:59 -08:00

..

hapi-8.2.0.d.ts

Merge branch 'types-2.0' into types-merge-20161118

2016-11-21 16:16:59 -08:00

hapi-tests-8.2.0.ts

Merge remote-tracking branch 'upstream/master' into types-2.0

2016-11-18 20:42:46 -08:00

hapi-tests.ts

Fix hapi, i18next and leaflet merges

2016-11-21 10:59:47 -08:00

index.d.ts

More fixes for various merge problems

2016-11-21 13:40:52 -08:00

tsconfig.json

…