annotate vendor/plugins/classic_pagination/test/fixtures/.svn/text-base/projects.yml.svn-base @ 524:1248a47e81b3 feature_36

Merge from branch "luisf"
author luisf <luis.figueira@eecs.qmul.ac.uk>
date Mon, 25 Jul 2011 14:39:38 +0100
parents 513646585e45
children
rev   line source
Chris@0 1 action_controller:
Chris@0 2 id: 2
Chris@0 3 name: Active Controller
Chris@0 4
Chris@0 5 active_record:
Chris@0 6 id: 1
Chris@0 7 name: Active Record