Commit Graph

3 Commits

Author SHA1 Message Date
alan 8c19ec8aa0 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
	app/helpers/projects_helper.rb
	app/views/contest_notification/show.html.erb

Signed-off-by: alan <547533434@qq.com>
2014-09-15 10:58:14 +08:00
z9hang 4c58b6a50c 1、项目版本库中查看修订导航栏丢失,原因未指定layout,解决:指定laout。2、项目版本库操作中有两页面存在英文的ok按钮,将其通过国际化改为中文 2014-09-02 11:02:16 +08:00
huangjingquan 70b211e355 first commit 2013-08-01 10:33:49 +08:00