3 Commits

Author	SHA1	Message	Date
Tim	8feea07825	Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop ... Conflicts: db/schema.rb	2016-01-14 15:59:50 +08:00
ouyangxuhua	d6e7a2ade5	解决一些bug	2016-01-14 12:51:01 +08:00
ouyangxuhua	6cfda615d6	1.解决一些bug;2.组织子目录功能实现	2016-01-13 15:17:13 +08:00