Mercurial > hg > soundsoftware-site
diff app/models/journal_observer.rb @ 85:22c68d60853d cannam
Merge from branch "live"
| author | Chris Cannam |
|---|---|
| date | Thu, 16 Dec 2010 10:07:06 +0000 |
| parents | 94944d00e43c |
| children | cbce1fd3b1b7 |
| author | Chris Cannam |
|---|---|
| date | Thu, 16 Dec 2010 10:07:06 +0000 |
| parents | 94944d00e43c |
| children | cbce1fd3b1b7 |