annotate .svn/pristine/54/54aaade6975dce4afcd932f697233c2ac56da5c0.svn-base @ 927:9ee5fd0b9bd3

Merge from cannam_integration
author luisf <luis.figueira@eecs.qmul.ac.uk>
date Fri, 11 May 2012 16:13:59 +0100
parents cbb26bc654de
children
rev   line source
Chris@909 1 class SharedPluginController < ApplicationController
Chris@909 2 def an_action
Chris@909 3 render_class_and_action 'from beta_plugin'
Chris@909 4 end
Chris@909 5 end