diff options
| author | utvk <utvk@users.noreply.github.com> | 2016-05-11 22:44:14 +0200 |
|---|---|---|
| committer | utvk <utvk@users.noreply.github.com> | 2016-05-11 22:44:14 +0200 |
| commit | 9e8ef918110f966bdf88b421842c56786efb4a6c (patch) | |
| tree | 37459de5d1c38d7a1fc17cd16615e4e0bbaab35d /lib/views/general | |
| parent | d72388b7a7cac8a84050ecb77caf98d4260a206b (diff) | |
| parent | d3a5a2c54b2222e570c23ef57d4957891730aa92 (diff) | |
Merge branch 'master' into norway2
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> - - |