diff options
| author | Luke Shumaker <LukeShu@sbcglobal.net> | 2014-03-06 19:41:29 -0500 |
|---|---|---|
| committer | Luke Shumaker <LukeShu@sbcglobal.net> | 2014-03-06 19:41:29 -0500 |
| commit | d72452a5965c0df32a13053ae86bcd529fc0fc9e (patch) | |
| tree | fb03041e6cf5d8b56d308481492821af8e663028 /test/models/session_test.rb | |
| parent | 50371ba04b52f74bfc2ceb05a429e072ad4848bb (diff) | |
| parent | f5d36fc67d1994b7cc1ce02e7be2767ffcb47857 (diff) | |
Merge branch 'master' of github.com:LukeShu/leaguer
Conflicts:
app/controllers/tournaments_controller.rb
app/models/tournament.rb
app/views/tournaments/_selected.html.erb
app/views/tournaments/new.html.erb
db/migrate/20140306024707_create_servers.rb
db/migrate/20140306024711_create_matches.rb
db/migrate/20140306024713_create_teams.rb
db/migrate/20140306024715_create_alerts.rb
db/migrate/20140306024718_create_pms.rb
db/migrate/20140306024722_create_users.rb
db/migrate/20140306024724_create_sessions.rb
db/migrate/20140306024729_create_server_settings.rb
db/migrate/20140306024731_create_user_team_pairs.rb
db/migrate/20140306024733_create_team_match_pairs.rb
db/migrate/20140306024735_create_tournament_options.rb
db/migrate/20140306024744_add_hidden_attrs_to_user.rb
db/migrate/20140306202154_create_servers.rb
db/migrate/20140306202156_create_tournaments.rb
db/migrate/20140306202158_create_matches.rb
db/migrate/20140306202200_create_teams.rb
db/migrate/20140306202202_create_alerts.rb
db/migrate/20140306202204_create_pms.rb
db/migrate/20140306202207_create_games.rb
db/migrate/20140306202209_create_users.rb
db/migrate/20140306202211_create_sessions.rb
db/migrate/20140306202213_create_game_attributes.rb
db/migrate/20140306202215_create_server_settings.rb
db/migrate/20140306202217_create_tournament_options.rb
db/migrate/20140306202219_create_user_team_pairs.rb
db/migrate/20140306202224_create_team_match_pairs.rb
db/migrate/20140306202232_add_hidden_attrs_to_user.rb
db/migrate/20140306222309_create_servers.rb
db/migrate/20140306222320_create_matches.rb
db/migrate/20140306222325_create_teams.rb
db/migrate/20140306222330_create_alerts.rb
db/migrate/20140306222336_create_pms.rb
db/migrate/20140306222347_create_users.rb
db/migrate/20140306222352_create_sessions.rb
db/migrate/20140306222357_create_server_settings.rb
db/migrate/20140306222402_create_tournament_options.rb
db/migrate/20140306222422_create_user_team_pairs.rb
db/migrate/20140306222427_create_team_match_pairs.rb
db/migrate/20140306222447_add_hidden_attrs_to_user.rb
db/schema.rb
generate.sh
Diffstat (limited to 'test/models/session_test.rb')
0 files changed, 0 insertions, 0 deletions