| Age | Commit message (Collapse) | Author |
|---|
|
Conflicts:
app/controllers/users_controller.rb
app/views/users/index.html.erb
|
|
|
|
also, stick in a couple of missing 'bundle exec's
|
|
|
|
|
|
|
|
the mess I made.
|
|
|
|
pages as well as getting the gameType listing to work.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Conflicts:
Gemfile.lock
app/views/layouts/application.html.erb
config/routes.rb
|
|
|
|
Merge branch 'master' of https://github.com/LukeShu/leaguer
|
|
|
|
|
|
|
|
|
|
|
|
remember the name of
|
|
|
|
|
|
|
|
generate and start the server.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
options.
|
|
|
|
|
|
|
