{"push_id":910432138,"size":2,"distinct_size":2,"ref":"refs/heads/master","head":"5125cf52aff5424bfb205af45f266ef353dc264d","before":"97b6a30f2dac4e00f48115b99266c28c809f0700","commits":[{"sha":"8ef27aacf83d918f5b1a8bff9795e4252d9699a1","author":{"email":"6dc9b08dbf33f233628d6f14d8b5c631bc580ed7@umn.edu","name":"Aaron Johnson"},"message":"updates to allow both NBA and NFL with the proper server link","distinct":true,"url":"https://api.github.com/repos/ge3kusa/swole/commits/8ef27aacf83d918f5b1a8bff9795e4252d9699a1"},{"sha":"5125cf52aff5424bfb205af45f266ef353dc264d","author":{"email":"6dc9b08dbf33f233628d6f14d8b5c631bc580ed7@umn.edu","name":"Aaron Johnson"},"message":"Merge branch 'master' of https://github.com/ge3kusa/swole\n\n* 'master' of https://github.com/ge3kusa/swole:\n  Initial players and lineups view; relies on the server app as well (seperate app)\n\nConflicts:\n\tpackage.json\n\tsrc/app/app.jsx\n\tsrc/app/components/lineup.jsx\n\tsrc/app/components/lineups.jsx\n\tsrc/app/components/main.jsx\n\tsrc/app/components/players.jsx\n\tsrc/app/stylesheets/lineup.scss\n\tsrc/app/stylesheets/lineups.scss\n\tsrc/app/stylesheets/main.scss\n\tsrc/app/stylesheets/players.scss\n\tsrc/www/index.html","distinct":true,"url":"https://api.github.com/repos/ge3kusa/swole/commits/5125cf52aff5424bfb205af45f266ef353dc264d"}]}