Mercurial > hg > soundsoftware-site
diff app/models/journal_detail.rb @ 308:766ad4e52e6e cannam-pre-20110113-merge
Merge from branch "feature_117"
| author | Chris Cannam |
|---|---|
| date | Mon, 28 Mar 2011 17:41:23 +0100 |
| parents | 513646585e45 |
| children | 051f544170fe |
| author | Chris Cannam |
|---|---|
| date | Mon, 28 Mar 2011 17:41:23 +0100 |
| parents | 513646585e45 |
| children | 051f544170fe |