alan 02470491bd Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh ... Conflicts: app/views/contests/index.html.erb		2014-09-17 15:33:47 +08:00
..
en.yml	Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh	2014-09-15 10:58:14 +08:00
zh.yml	Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh	2014-09-17 15:33:47 +08:00