Mercurial > hg > soundsoftware-site

annotate .svn/pristine/39/39faeb0151b407d013fa291b6fe7a94c6860c63f.svn-base @ 984:8b6acaabe2da live

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge from branch "cannam"
author Chris Cannam
date Thu, 25 Oct 2012 14:55:04 +0100
parents cbb26bc654de
children
rev   line source
Chris@909 1 class AppAndPluginController < ApplicationController
Chris@909 2 def an_action
Chris@909 3 render_class_and_action 'from app'
Chris@909 4 end
Chris@909 5 end