{"push_id":876303116,"size":18,"distinct_size":1,"ref":"refs/heads/Tyler","head":"ddef83043ddf44ec28946096681fc6cddd54ea93","before":"726097d146950205200e4f12be692d8387ed3301","commits":[{"sha":"471288c44a88880237cc3346dee8d4525a7b695d","author":{"email":"d3b1cb5db72b1efca0825fe77a16c4bd01979ac6@live.ca","name":"Andrew Delph"},"message":"added class variables to Tournament\n\nteamlist and addteam","distinct":false,"url":"https://api.github.com/repos/rkanjani/FootyManager/commits/471288c44a88880237cc3346dee8d4525a7b695d"},{"sha":"1d6ba5e1fcec1c8ebad7326d46fde8ee4d3eaf74","author":{"email":"2e4a2788b96d3b8bcadb6d0d80cef8572dac132a@gmail.com","name":"rkanjani"},"message":"Merge branch 'master' into updates\n\nConflicts:\n\tapp/src/main/java/oceansfive/footymanager/Tournament.java","distinct":false,"url":"https://api.github.com/repos/rkanjani/FootyManager/commits/1d6ba5e1fcec1c8ebad7326d46fde8ee4d3eaf74"},{"sha":"c12d4aa588d6b71238eb9ba5fe1d58e4e71ee96e","author":{"email":"2e4a2788b96d3b8bcadb6d0d80cef8572dac132a@gmail.com","name":"rkanjani"},"message":"fixed","distinct":false,"url":"https://api.github.com/repos/rkanjani/FootyManager/commits/c12d4aa588d6b71238eb9ba5fe1d58e4e71ee96e"},{"sha":"4cfe5ef59f63dacc6029dcad911d62fe28a0339a","author":{"email":"2e4a2788b96d3b8bcadb6d0d80cef8572dac132a@gmail.com","name":"rkanjani"},"message":"updated","distinct":false,"url":"https://api.github.com/repos/rkanjani/FootyManager/commits/4cfe5ef59f63dacc6029dcad911d62fe28a0339a"},{"sha":"ba1050e2ea910f4e0173aea83d4ea056b42e609a","author":{"email":"2e4a2788b96d3b8bcadb6d0d80cef8572dac132a@gmail.com","name":"Rohan Kanjani"},"message":"Merge pull request #4 from rkanjani/updates\n\nUpdates","distinct":false,"url":"https://api.github.com/repos/rkanjani/FootyManager/commits/ba1050e2ea910f4e0173aea83d4ea056b42e609a"},{"sha":"ff64e1a3ed9612e59bfa45e7b866957cba10d088","author":{"email":"2e4a2788b96d3b8bcadb6d0d80cef8572dac132a@gmail.com","name":"rkanjani"},"message":"TournamentData Cleanup","distinct":false,"url":"https://api.github.com/repos/rkanjani/FootyManager/commits/ff64e1a3ed9612e59bfa45e7b866957cba10d088"},{"sha":"51eda8cd3c5abe18f4d6b5909de5b1aa77485ca9","author":{"email":"2e4a2788b96d3b8bcadb6d0d80cef8572dac132a@gmail.com","name":"rkanjani"},"message":"fixing tournament","distinct":false,"url":"https://api.github.com/repos/rkanjani/FootyManager/commits/51eda8cd3c5abe18f4d6b5909de5b1aa77485ca9"},{"sha":"a4753e1b12c8bb4d7105db0351f1824bcb4f388b","author":{"email":"2e4a2788b96d3b8bcadb6d0d80cef8572dac132a@gmail.com","name":"Rohan Kanjani"},"message":"Merge pull request #5 from rkanjani/updates\n\nTournamentData Cleanup","distinct":false,"url":"https://api.github.com/repos/rkanjani/FootyManager/commits/a4753e1b12c8bb4d7105db0351f1824bcb4f388b"},{"sha":"603368d43931793f880a68fef2f9ae8dd5102182","author":{"email":"d3b1cb5db72b1efca0825fe77a16c4bd01979ac6@live.ca","name":"Andrew Delph"},"message":"ability to add tournaments from button\n\n-createTournament\n-fail cases\n-toasts\n-cancel button","distinct":false,"url":"https://api.github.com/repos/rkanjani/FootyManager/commits/603368d43931793f880a68fef2f9ae8dd5102182"},{"sha":"b1dce632f6fd062cfed5ec493ba89028837d827d","author":{"email":"d3b1cb5db72b1efca0825fe77a16c4bd01979ac6@live.ca","name":"Andrew Delph"},"message":"Merge remote-tracking branch 'origin/master'\n\nresolved conflicts though....\nConflicts:\n\tapp/src/main/java/oceansfive/footymanager/MainActivity.java\n\tapp/src/main/java/oceansfive/footymanager/Tournament.java\n\tapp/src/main/java/oceansfive/footymanager/TournamentData.java\n\tapp/src/main/java/oceansfive/footymanager/listAdapter.java","distinct":false,"url":"https://api.github.com/repos/rkanjani/FootyManager/commits/b1dce632f6fd062cfed5ec493ba89028837d827d"},{"sha":"e73549b758aa65642fe1c55e6f270551739d3425","author":{"email":"2e4a2788b96d3b8bcadb6d0d80cef8572dac132a@gmail.com","name":"rkanjani"},"message":"Revert \"Merge remote-tracking branch 'origin/master'\"\n\nThis reverts commit b1dce632f6fd062cfed5ec493ba89028837d827d, reversing\nchanges made to 603368d43931793f880a68fef2f9ae8dd5102182.","distinct":false,"url":"https://api.github.com/repos/rkanjani/FootyManager/commits/e73549b758aa65642fe1c55e6f270551739d3425"},{"sha":"c2b4c55e406f7fb27229396872d3b935052bdfe7","author":{"email":"2e4a2788b96d3b8bcadb6d0d80cef8572dac132a@gmail.com","name":"rkanjani"},"message":"Revert \"ability to add tournaments from button\"\n\nThis reverts commit 603368d43931793f880a68fef2f9ae8dd5102182.","distinct":false,"url":"https://api.github.com/repos/rkanjani/FootyManager/commits/c2b4c55e406f7fb27229396872d3b935052bdfe7"},{"sha":"b4eb581199b5f43768ac339f7fc27d07e5fbc1b6","author":{"email":"2e4a2788b96d3b8bcadb6d0d80cef8572dac132a@gmail.com","name":"rkanjani"},"message":"Updates","distinct":false,"url":"https://api.github.com/repos/rkanjani/FootyManager/commits/b4eb581199b5f43768ac339f7fc27d07e5fbc1b6"},{"sha":"70f46a6c347ce48b95ee08a1a69b84d8d376e292","author":{"email":"2e4a2788b96d3b8bcadb6d0d80cef8572dac132a@gmail.com","name":"Rohan Kanjani"},"message":"Merge pull request #6 from rkanjani/rohan\n\nUpdates","distinct":false,"url":"https://api.github.com/repos/rkanjani/FootyManager/commits/70f46a6c347ce48b95ee08a1a69b84d8d376e292"},{"sha":"bc6638d5d3b1648ec6aacea50a4662e4a2c75efd","author":{"email":"2e4a2788b96d3b8bcadb6d0d80cef8572dac132a@gmail.com","name":"rkanjani"},"message":"Merge branch 'master' into rohan","distinct":false,"url":"https://api.github.com/repos/rkanjani/FootyManager/commits/bc6638d5d3b1648ec6aacea50a4662e4a2c75efd"},{"sha":"b272ae5bef9b6e11f1f2647a79ad92419cbb761d","author":{"email":"2e4a2788b96d3b8bcadb6d0d80cef8572dac132a@gmail.com","name":"rkanjani"},"message":"Fixed Problems","distinct":false,"url":"https://api.github.com/repos/rkanjani/FootyManager/commits/b272ae5bef9b6e11f1f2647a79ad92419cbb761d"},{"sha":"87fb8906a95899ea6547fcb751ed1b3e9f54ac76","author":{"email":"2e4a2788b96d3b8bcadb6d0d80cef8572dac132a@gmail.com","name":"Rohan Kanjani"},"message":"Merge pull request #8 from rkanjani/rohan\n\nRohan","distinct":false,"url":"https://api.github.com/repos/rkanjani/FootyManager/commits/87fb8906a95899ea6547fcb751ed1b3e9f54ac76"},{"sha":"ddef83043ddf44ec28946096681fc6cddd54ea93","author":{"email":"2e4a2788b96d3b8bcadb6d0d80cef8572dac132a@gmail.com","name":"rkanjani"},"message":"Merge branch 'master' into Tyler\n\n# Conflicts:\n#\t.idea/misc.xml\n#\tapp/src/main/java/oceansfive/footymanager/Tournament.java","distinct":true,"url":"https://api.github.com/repos/rkanjani/FootyManager/commits/ddef83043ddf44ec28946096681fc6cddd54ea93"}]}