Commit Graph

4 Commits

Author SHA1 Message Date
Benjy Cui
5d39bd9c54 fix: resolve merge conflict 2016-08-22 17:18:26 +08:00
Benjy Cui
e6280a7ea6 Merge branch '1.x-stable' 2016-08-22 17:05:37 +08:00
afc163
b200f8a2d8 Merge 1.x-stable 2016-08-08 14:12:02 +08:00
afc163
730dbc72f7 Add typings 2016-07-14 18:15:59 +08:00