summaryrefslogtreecommitdiff
path: root/app/views/layouts/application.html.erb
diff options
context:
space:
mode:
authorshumakl <shumakl@purdue.edu>2014-04-03 12:32:48 -0400
committershumakl <shumakl@purdue.edu>2014-04-03 12:32:48 -0400
commit4015a27f66eafee66137bc27a76843bd48139772 (patch)
treef2e4347606fa9bdec73ede85d562a7b891c85df2 /app/views/layouts/application.html.erb
parent8d5325cd6019b784ba2da66d19c41daaadbc19e0 (diff)
parent8e3e46b7951120f1ec34949d607a7672ad03f820 (diff)
Merge branch 'clean2'
Conflicts: app/controllers/alerts_controller.rb app/controllers/application_controller.rb app/controllers/matches_controller.rb app/controllers/servers_controller.rb app/controllers/sessions_controller.rb app/controllers/tournaments_controller.rb app/controllers/users_controller.rb app/models/match.rb app/models/team.rb app/models/tournament.rb app/views/sessions/_form.html.erb app/views/sessions/index.html.erb app/views/sessions/index.json.jbuilder app/views/sessions/show.html.erb app/views/sessions/show.json.jbuilder app/views/tournaments/index.html.erb config/routes.rb generate.sh
Diffstat (limited to 'app/views/layouts/application.html.erb')
0 files changed, 0 insertions, 0 deletions