yanxd 70abac4c1e Merge branch 'competition' into develop ... Conflicts: app/controllers/application_controller.rb config/locales/en.yml config/locales/zh.yml db/schema.rb		2014-06-13 10:59:43 +08:00
..
help	error message: Redmine ==> Trustie	2013-08-12 23:42:39 +08:00
images	bootstrap & tag bug	2014-05-23 17:07:58 +08:00
javascripts	bootstrap test	2014-05-26 11:27:10 +08:00
statistics/trustie2	move 2013.8.29	2013-08-30 09:34:21 +08:00
stylesheets	Merge branch 'competition' into develop	2014-06-13 10:59:43 +08:00
themes	坑	2014-06-10 17:33:40 +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
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