diff options
author | Luke Shumaker <LukeShu@sbcglobal.net> | 2014-03-06 19:56:33 -0500 |
---|---|---|
committer | Luke Shumaker <LukeShu@sbcglobal.net> | 2014-03-06 19:56:33 -0500 |
commit | a1700f50ee800cfbfb93bd7dfff7b5d79ae2cb2f (patch) | |
tree | c9db0b8bdd4818f5ce2ff982657e2aedfda98f8f /app/views/layouts/application.html.erb | |
parent | 706392b7c4520382ddd8f827b31205c6b71f5320 (diff) | |
parent | 63830b0f939db5f6911218950525428420c4d467 (diff) |
Merge branch 'master2'
Conflicts:
app/controllers/tournaments_controller.rb
app/models/tournament.rb
app/views/tournaments/_selected.html.erb
app/views/tournaments/new.html.erb
config/routes.rb
Diffstat (limited to 'app/views/layouts/application.html.erb')
-rw-r--r-- | app/views/layouts/application.html.erb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 7578d82..976ee85 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -33,7 +33,7 @@ <div class="container"><%= yield %></div> <footer> - <p>Leaguer is copyright © 2014, Tomer Kimia, Andrew Murrell, Luke Shumaker, Nathaniel Foy, Davis Webb, and Guntas Grewal</p> + <p>Leaguer © 2014, Tomer Kimia, Andrew Murrell, Luke Shumaker, Nathaniel Foy, Davis Webb, and Guntas Grewal</p> </footer> <%= debug(params) if Rails.env.development? %> </body> |