5 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	d5fc0277a2	3.2组织资源的样式更新	2016-01-12 16:43:40 +08:00
ouyangxuhua	219774afab	将课程动态加入组织动态中	2015-11-18 16:05:08 +08:00
lizanle	56613b6358	增加项目的显示	2015-11-14 10:45:49 +08:00
ouyangxuhua	283af137c6	组织模块动态及配置	2015-11-05 17:57:07 +08:00