diff options
author | Gareth Rees <gareth@garethrees.co.uk> | 2016-12-14 11:28:50 +0000 |
---|---|---|
committer | Gareth Rees <gareth@garethrees.co.uk> | 2016-12-14 11:28:50 +0000 |
commit | 05dd15e00d289dbe558dfda6dfbf8b24d74e678a (patch) | |
tree | bae42727829448da6e796ee90a36a9bc21874386 /lib/views/general | |
parent | b26b78c093b751b27ed77138c3c34f365dc9f649 (diff) | |
parent | 041b416fd4bbd7286252f24135f5a2bc19e36395 (diff) |
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'lib/views/general')
-rw-r--r-- | lib/views/general/mycontroller.html.erb | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/lib/views/general/mycontroller.html.erb b/lib/views/general/mycontroller.html.erb deleted file mode 100644 index ad642d3..0000000 --- a/lib/views/general/mycontroller.html.erb +++ /dev/null @@ -1,7 +0,0 @@ -<% @title = "My new controller" %> - -<h1>My new controller</h1> - -<p>This is a view of a controller that does almost nothing, except output the words <code><%= @say_something %></code></p> - - |