view .svn/pristine/ad/ad198b4ca217e676200add6d2e30b0345b1e653c.svn-base @ 1344:e5d5cb1bc3be live

Merge from branch cannam
author Chris Cannam <chris.cannam@soundsoftware.ac.uk>
date Fri, 21 Jun 2013 11:19:15 +0100
parents cbb26bc654de
children
line wrap: on
line source
david_action_controller:
  developer_id: 1
  project_id: 2
  joined_on: 2004-10-10

david_active_record:
  developer_id: 1
  project_id: 1
  joined_on: 2004-10-10

jamis_active_record:
  developer_id: 2
  project_id: 1