HeskeyBaozi bab50e6bed Merge branch 'feature-3.8.0' of https://github.com/ant-design/ant-design into feature/svg-icon ... # Conflicts: # components/locale-provider/__tests__/__snapshots__/demo.test.js.snap # components/locale-provider/__tests__/__snapshots__/index.test.js.snap # components/transfer/__tests__/__snapshots__/demo.test.js.snap # components/transfer/__tests__/__snapshots__/index.test.js.snap		2018-07-23 09:58:55 +08:00
..
__snapshots__	Merge branch 'feature-3.8.0' of https://github.com/ant-design/ant-design into feature/svg-icon	2018-07-23 09:58:55 +08:00
demo.test.js	Don't ignore test files.	2016-12-14 14:48:09 +08:00
index.test.js	Revert "fix test"	2018-07-17 22:22:16 +08:00