xianbo e52886cf46 Merge branch 'competition' of 10.0.47.245:/home/trustie2 into develop ... Conflicts: app/views/softapplications/show.html.erb db/schema.rb		2014-05-23 09:49:36 +08:00
..
help	error message: Redmine ==> Trustie	2013-08-12 23:42:39 +08:00
images	edit 图标丢失	2014-05-17 10:44:01 +08:00
javascripts	import hubspot	2014-05-22 11:00:13 +08:00
statistics/trustie2	move 2013.8.29	2013-08-30 09:34:21 +08:00
stylesheets	Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop	2014-05-23 09:44:33 +08:00
themes	调整参赛作品编辑页面中托管项目列表的显示宽度	2014-05-20 16:13:59 +08:00
404.html	error message: Redmine ==> Trustie	2013-08-12 23:42:39 +08:00
500.html	new version	2013-09-12 10:41:15 +08:00
application.css	first commit	2013-08-01 10:33:49 +08:00
dispatch.fcgi.example	first commit	2013-08-01 10:33:49 +08:00
favicon.ico	first commit	2013-08-01 10:33:49 +08:00
favicon.old.ico	first commit	2013-08-01 10:33:49 +08:00
htaccess.fcgi.example	first commit	2013-08-01 10:33:49 +08:00