Age | Commit message (Collapse) | Author |
|
Merge branch 'master' of https://github.com/LukeShu/leaguer
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Conflicts:
Gemfile.lock
app/views/layouts/application.html.erb
config/routes.rb
|
|
Conflicts:
Gemfile.lock
app/views/layouts/application.html.erb
config/routes.rb
|
|
|
|
|
|
|
|
Merge branch 'master' of https://github.com/LukeShu/leaguer
|
|
Merge branch 'master' of https://github.com/LukeShu/leaguer
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
remember the name of
|
|
remember the name of
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
generate and start the server.
|
|
generate and start the server.
|
|
|
|
|
|
|
|
|
|
|