diff options
author | Luke Shumaker <LukeShu@sbcglobal.net> | 2014-03-03 23:06:47 -0500 |
---|---|---|
committer | Luke Shumaker <LukeShu@sbcglobal.net> | 2014-03-03 23:06:47 -0500 |
commit | 8b526eadfcb024a5e8ead4c5b63eacb554db0cf5 (patch) | |
tree | c96e10e0e0e48154430a4d733c6385433dbe2739 /config/application.rb | |
parent | 3c9da1eee130d49f998016f8bad91f97f8bdf100 (diff) | |
parent | 423d0e5a440d8d66407522bc842ef273196173bc (diff) |
Merge branch 'clean4'
Conflicts:
app/assets/stylesheets/scaffolds.css.scss
app/assets/stylesheets/static.css.scss
app/controllers/sessions_controller.rb
app/controllers/static_controller.rb
app/controllers/tournaments_controller.rb
app/controllers/users_controller.rb
app/helpers/sessions_helper.rb
app/models/game.rb
app/models/user.rb
app/views/games/index.html.erb
app/views/tournaments/index.html.erb
app/views/tournaments/new.html.erb
app/views/users/_form.html.erb
app/views/users/index.html.erb
app/views/users/index.json.jbuilder
app/views/users/new.html.erb
app/views/users/show.html.erb
app/views/users/show.json.jbuilder
config/routes.rb
generate.sh
Diffstat (limited to 'config/application.rb')
0 files changed, 0 insertions, 0 deletions