annotate .svn/pristine/80/8037a24ac1c230918a9d49478ffdf3d5e6485948.svn-base @ 1022:f2ec92061fca browsing

Merge from live branch
author Chris Cannam <chris.cannam@soundsoftware.ac.uk>
date Tue, 13 Nov 2012 10:35:40 +0000
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