Mercurial > hg > soundsoftware-site
view .svn/pristine/fc/fcea6055312718c79b19d49925ca680df3e4895d.svn-base @ 1204:d24c22d420eb live
Merge from branch "cannam"
author | Chris Cannam |
---|---|
date | Wed, 23 Jan 2013 11:46:22 +0000 |
parents | cbb26bc654de |
children |
line wrap: on
line source
witty_retort: id: 1 topic_id: 1 content: Birdman is better! created_at: <%= 6.hours.ago.to_s(:db) %> updated_at: nil another: id: 2 topic_id: 2 content: Nuh uh! created_at: <%= 1.hour.ago.to_s(:db) %> updated_at: nil