Commit Graph

54 Commits

Author SHA1 Message Date
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
Benjy Cui
ca5fe46611 docs: fix demo 2016-08-08 10:57:11 +08:00
The Rock
dc0fc80709 docs(translation): translation for layout (#2635) 2016-08-08 10:40:02 +08:00