c
Merge branch '0.6.1' of https://github.com/b3log/b3log-solo into 0.6.1