wanglinchun 9ac0cbe6a3 Merge branch 'competition' into develop ... Conflicts: Gemfile app/controllers/tags_controller.rb app/views/layouts/_base_header.html.erb config/routes.rb db/schema.rb		2014-04-18 16:03:52 +08:00
..
en.yml	汉化部分	2014-04-01 09:52:52 +08:00
zh.yml	Merge branch 'competition' into develop	2014-04-18 16:03:52 +08:00