commit
Error fix
Revert "commit"

This reverts commit 7eeed90e1712333f3d5379eb51f36936960fd6df.
Merge branch 'master' of https://github.com/iflylabs/iflychat-oxwall