summaryrefslogtreecommitdiff
path: root/app/views/servers/index.json.jbuilder
diff options
context:
space:
mode:
authorDavisLWebb <davislwebb@ymail.com>2014-03-02 15:06:54 -0500
committerDavisLWebb <davislwebb@ymail.com>2014-03-02 15:06:54 -0500
commitb677983475513c78108406901fccd5cbe9604ca6 (patch)
treef83b5e20930cbe1be890af41ea1d0c0d2ebf5e2e /app/views/servers/index.json.jbuilder
parent4e682a9a8596326a2d1faab6c44e5a54918c5ba0 (diff)
parent1bfc0513fa113f5b4a61e89d74e42dd78ece44e7 (diff)
Merge branch 'master' of http://github.com/LukeShu/leaguer
Conflicts: Gemfile.lock app/views/layouts/application.html.erb config/routes.rb
Diffstat (limited to 'app/views/servers/index.json.jbuilder')
-rw-r--r--app/views/servers/index.json.jbuilder4
1 files changed, 0 insertions, 4 deletions
diff --git a/app/views/servers/index.json.jbuilder b/app/views/servers/index.json.jbuilder
deleted file mode 100644
index 2776abc..0000000
--- a/app/views/servers/index.json.jbuilder
+++ /dev/null
@@ -1,4 +0,0 @@
-json.array!(@servers) do |server|
- json.extract! server, :id
- json.url server_url(server, format: :json)
-end