Mercurial > hg > soundsoftware-site
view .svn/pristine/39/39faeb0151b407d013fa291b6fe7a94c6860c63f.svn-base @ 1528:5047f066734d live
Fix merge failure in de.yml
author | Chris Cannam |
---|---|
date | Fri, 26 Sep 2014 10:18:42 +0100 |
parents | cbb26bc654de |
children |
line wrap: on
line source
class AppAndPluginController < ApplicationController def an_action render_class_and_action 'from app' end end