Commit Graph

2 Commits

Author SHA1 Message Date
ouyangxuhua 5034ddb4b6 修复组织的bug 2015-12-07 12:53:51 +08:00
ouyangxuhua 58365e8892 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
	public/stylesheets/new_user.css
2.组织增加项目功能
2015-11-27 09:50:17 +08:00