merge upstream/master

2016-11-09 18:37:24 +08:00 · 2016-11-09 18:37:24 +08:00 · f36b29707c
commit f36b29707c
parent e1134de2bc d9ef3d93b7
47 changed files with 1159 additions and 347 deletions
--- a/src/index.js
+++ b/src/index.js
@ -52,7 +52,8 @@ const iview = {
    Modal,
    Notice,
    iOption: Option,
-    OptionGroup: OptionGroup,
+    OptionGroup,
+    iOptionGroup: OptionGroup,
    Page,
    Panel: Collapse.Panel,
    Poptip,