diff test/functional/journals_controller_test.rb @ 1225:edf7563e2653 live

Merge from branch "cannam"
author Chris Cannam
date Tue, 12 Mar 2013 15:14:07 +0000
parents cbce1fd3b1b7
children 433d4f72a19b
line wrap: on
line diff