Age | Commit message (Collapse) | Author | |
---|---|---|---|
2014-04-23 | Merge branch 'clean2' | Luke Shumaker | |
Conflicts: app/assets/stylesheets/static.css.scss app/controllers/static_controller.rb | |||
2014-03-02 | currently adding Session controller and view | DavisLWebb | |
2014-03-02 | Merge branch 'master' of http://github.com/LukeShu/leaguer | DavisLWebb | |
Conflicts: Gemfile.lock app/views/layouts/application.html.erb config/routes.rb | |||
2014-02-18 | Changes to generate.sh | AndrewMurrell | |