Mercurial > hg > soundsoftware-site

annotate .svn/pristine/39/39faeb0151b407d013fa291b6fe7a94c6860c63f.svn-base @ 1528:5047f066734d live

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix merge failure in de.yml
author Chris Cannam
date Fri, 26 Sep 2014 10:18:42 +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