annotate vendor/plugins/classic_pagination/test/fixtures/.svn/text-base/projects.yml.svn-base @ 804:548e23d4cd71 live

Merge from branch "cannam"
author Chris Cannam
date Wed, 23 Nov 2011 11:15:54 +0000
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