summaryrefslogtreecommitdiff
path: root/app/controllers/search_controller.rb
diff options
context:
space:
mode:
authorDavisLWebb <davislwebb@ymail.com>2014-03-04 16:27:11 -0500
committerDavisLWebb <davislwebb@ymail.com>2014-03-04 16:27:11 -0500
commit2eb8e1c090071abf3108828efc831f12128e17df (patch)
treea1410e2cc118db1b410808b7f339e4c5f52bd43c /app/controllers/search_controller.rb
parentfb76b4db64583def6db3aac43e31c25d3bd489df (diff)
parentaca85cf084702c29014a17eafb090421061fae8b (diff)
Merge branch 'master' of http://github.com/LukeShu/leaguer
Conflicts: app/assets/stylesheets/scaffolds.css.scss app/views/games/index.html.erb db/migrate/20140304043618_create_servers.rb db/migrate/20140304043622_create_matches.rb db/migrate/20140304043631_create_games.rb
Diffstat (limited to 'app/controllers/search_controller.rb')
-rw-r--r--app/controllers/search_controller.rb2
1 files changed, 2 insertions, 0 deletions
diff --git a/app/controllers/search_controller.rb b/app/controllers/search_controller.rb
new file mode 100644
index 0000000..ee61487
--- /dev/null
+++ b/app/controllers/search_controller.rb
@@ -0,0 +1,2 @@
+class SearchController < ApplicationController
+end