Commited
Merge branch 'master' of /run/media/wang_rk/Фĳ/issss
Commit
x
Merge branch 'master' of /run/media/wang_rk/Фĳ/issss
Merge branch 'master' of /run/media/wang_rk/Фĳ/issss

Conflicts:
	views/user_info.erb
qwds
Merge branch 'master' of /run/media/wang_rk/Фĳ/issss
Merge branch 'master' of github.com:xwak/issss

Conflicts:
	views/question.erb