Karol Janyst abd91fedd2 Resolve conflicts

2017-01-30 12:29:08 +09:00

..

index.d.ts

Support Pick<> on setState now that TS 2.1 is out (#13155)

2017-01-23 12:36:53 -08:00

react-i18next-tests.tsx

…

tsconfig.json

Fix typings that depend on old version

2017-01-26 14:17:05 +09:00