summaryrefslogtreecommitdiff
path: root/app/controllers/servers_controller.rb
diff options
context:
space:
mode:
authorLuke Shumaker <LukeShu@sbcglobal.net>2014-03-06 19:47:20 -0500
committerLuke Shumaker <LukeShu@sbcglobal.net>2014-03-06 19:47:20 -0500
commit706392b7c4520382ddd8f827b31205c6b71f5320 (patch)
tree55444920bb49c5cc104e919737ebcda44eb45321 /app/controllers/servers_controller.rb
parenteebd00ba4692a6a285c9807705331ab924ce225f (diff)
parentd72452a5965c0df32a13053ae86bcd529fc0fc9e (diff)
Merge branch 'clean'
Conflicts: app/controllers/tournaments_controller.rb app/views/teams/show.html.erb app/views/tournaments/index.html.erb config/routes.rb
Diffstat (limited to 'app/controllers/servers_controller.rb')
0 files changed, 0 insertions, 0 deletions