You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

wanglinchun 9af6c03547 Merge branch 'competition' into develop ... Conflicts: Gemfile.lock app/views/layouts/_base_footer.html.erb		11 years ago
..
assets	jrating	11 years ago
controllers	Merge branch 'competition' into develop	11 years ago
helpers	用户评分理论上完成版.	11 years ago
models	Merge branch 'competition' into develop	11 years ago
sweepers	first commit	12 years ago
views	Merge branch 'competition' into develop	11 years ago