annotate .svn/pristine/80/8037a24ac1c230918a9d49478ffdf3d5e6485948.svn-base @ 931:ec1c49528f36 cannam_integration

Merge from branch "redmine-1.3"
author Chris Cannam
date Wed, 27 Jun 2012 15:04:58 +0100
parents cbb26bc654de
children
rev   line source
Chris@909 1 action_controller:
Chris@909 2 id: 2
Chris@909 3 name: Active Controller
Chris@909 4
Chris@909 5 active_record:
Chris@909 6 id: 1
Chris@909 7 name: Active Record