Mercurial > hg > soundsoftware-site
diff test/functional/journals_controller_test.rb @ 1042:26a835cb14f9 live
Merge from branch cannam
author | Chris Cannam |
---|---|
date | Tue, 13 Nov 2012 15:39:30 +0000 |
parents | cbce1fd3b1b7 |
children | 433d4f72a19b |
author | Chris Cannam |
---|---|
date | Tue, 13 Nov 2012 15:39:30 +0000 |
parents | cbce1fd3b1b7 |
children | 433d4f72a19b |