Mercurial > hg > soundsoftware-site
diff app/models/user.rb @ 431:d3af621ba9d4 bug_168
Update the master branch via git pull master rather than git fetch (which doesn't merge any particular branch)
author | Chris Cannam |
---|---|
date | Sun, 05 Jun 2011 10:28:27 +0100 |
parents | 440c4f4bf2d6 |
children | 73ff0e6a11b1 b15397a5341c |