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
..
migrate	Merge branch 'competition' into develop	2014-06-13 10:59:43 +08:00
development.sqlite3	first commit	2013-08-01 10:33:49 +08:00
schema.rb	rake db:migrate	2014-06-12 14:43:51 +08:00