Show More
Description:
Merge branch 'master' into codejom (user stat reset)...
Description:
Merge branch 'master' into codejom (user stat reset)
Conflicts:
app/models/user.rb
References:
Name | Size | Modified | Last Commit | Author |
---|---|---|---|---|
.. | ||||
controllers | ||||
models | ||||
rcov.opts | Loading ... | |||
spec.opts | Loading ... | |||
spec_helper.rb | Loading ... |