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
..
demo.test.js.snap	upgrade test cases	2018-07-19 20:37:47 +08:00
directory.test.js.snap	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