C
Typo
Sth
XM
Merge branch 'master' of /run/media/wang_rk/Фĳ/issss

Conflicts:
	app.rb
a
xiaomou-commit
ui-fixed
xiaomou-commit
ui-fixed删掉
jq-fixed