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
..
en.yml	233	2014-05-22 15:33:38 +08:00
zh.yml	Merge branch 'competition' of 10.0.47.245:/home/trustie2 into develop	2014-05-23 09:49:36 +08:00