view .svn/pristine/ad/ad198b4ca217e676200add6d2e30b0345b1e653c.svn-base @ 1348:0f5c32bfd33e live

Merge from branch "luisf"
author Chris Cannam
date Wed, 03 Jul 2013 09:57:31 +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