diff options
| author | DavisLWebb <davislwebb@ymail.com> | 2014-03-06 17:45:22 -0500 |
|---|---|---|
| committer | DavisLWebb <davislwebb@ymail.com> | 2014-03-06 17:45:22 -0500 |
| commit | 0c1299795a492e6296eb8e15bca576ea5139be6b (patch) | |
| tree | 3921daf8c26d656b12b20ee22be63c97fa20f6fa /app/views/teams/show.json.jbuilder | |
| parent | 110d67f433c091a3b739c5bbebe110d963efaa73 (diff) | |
| parent | fe7d5ad458b4cabd8fd57b47f81abc56dd8532ad (diff) | |
Merge branch 'master' of http://github.com/LukeShu/leaguer
Conflicts:
app/controllers/sessions_controller.rb
app/views/sessions/new.html.erb
Diffstat (limited to 'app/views/teams/show.json.jbuilder')
| -rw-r--r-- | app/views/teams/show.json.jbuilder | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/teams/show.json.jbuilder b/app/views/teams/show.json.jbuilder index 1538019..8a85dcc 100644 --- a/app/views/teams/show.json.jbuilder +++ b/app/views/teams/show.json.jbuilder @@ -1 +1 @@ -json.extract! @team, :id, :created_at, :updated_at +json.extract! @team, :id, :match_id, :created_at, :updated_at |