view .svn/pristine/ad/ad198b4ca217e676200add6d2e30b0345b1e653c.svn-base @ 956:fa2a1b6cda26 cannam

Merge from branch "live"
author Chris Cannam
date Tue, 16 Oct 2012 15:25:22 +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