Mercurial > hg > soundsoftware-site
diff app/models/member.rb @ 941:6d4cafba9468 live
Merge from the default branch
| author | Chris Cannam |
|---|---|
| date | Wed, 11 Jul 2012 14:36:11 +0100 |
| parents | 5f33065ddc4b |
| children | 433d4f72a19b |
| author | Chris Cannam |
|---|---|
| date | Wed, 11 Jul 2012 14:36:11 +0100 |
| parents | 5f33065ddc4b |
| children | 433d4f72a19b |