1
Merge branch 'master' into test
1
1
1
3
3
Merge branch 'JinoLi-master'
Merge pull request #6 from JinoLi/master

4
1
Merge remote-tracking branch 'origin/master'
fuck
Revert "fuck"

This reverts commit ddd4e602d2d0e88751b2e10f7da108f17e3247f6.

	new file:   discuz/readme/changelog.txt
	new file:   discuz/readme/convert.txt
	new file:   discuz/readme/license.txt
	new file:   discuz/readme/readme.txt
	new file:   discuz/readme/upgrade.txt
	modified:   discuz/upload/source/module/forum/forum_index.php
	modified:   wwwroot/Application/Home/Common/function.php
	modified:   wwwroot/Application/Home/Controller/UserController.class.php
2
Merge pull request #7 from JinoLi/master

3
2
2
1
1
hey