Commit Graph

6 Commits

Author SHA1 Message Date
lizanle fd42af1ac4 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-01-27 14:32:54 +08:00
lizanle 0147b30133 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
	Gemfile
2015-01-23 10:25:28 +08:00
zhuhao a145f04c27 在gemfile中添加rspec 2015-01-20 16:56:23 +08:00
alan b9ea3e589e 修改《邮件系统》页面
Signed-off-by: alan <547533434@qq.com>
2015-01-17 11:18:24 +08:00
lizanle 10cde37582 cache using version 2015-01-07 09:27:44 +08:00
alan 87fdecdabd 创新竞赛添加删除功能 2014-04-21 18:13:57 +08:00