{"push_id":882703106,"size":10,"distinct_size":10,"ref":"refs/heads/master","head":"eea851f61b590480ff89f5ec6bba87ed982073c3","before":"0d362502f9553462d3e30c9dd8716b9303d357e5","commits":[{"sha":"1356cdfdb456428a3379d7cfe17ccf2074ad9d22","author":{"email":"99685b1bdbf276e116404513ca523b382b337e9d@ualberta.ca","name":"Stephen"},"message":"SZ Icon fixed\nTiny one added","distinct":true,"url":"https://api.github.com/repos/nwoeanhinnogaehr/Team15Alpha/commits/1356cdfdb456428a3379d7cfe17ccf2074ad9d22"},{"sha":"c4eb290bf044257a6edc14ef84debf00ea121847","author":{"email":"3fb6c4d721d441e2197e0e1274f6cdea3c505288@ualberta.ca","name":"ctevans"},"message":"Merge remote-tracking branch 'upstream/master'","distinct":true,"url":"https://api.github.com/repos/nwoeanhinnogaehr/Team15Alpha/commits/c4eb290bf044257a6edc14ef84debf00ea121847"},{"sha":"c7686a9c5f55adfc4ac85c5ccda2ecaae4683f42","author":{"email":"3fb6c4d721d441e2197e0e1274f6cdea3c505288@ualberta.ca","name":"ctevans"},"message":"Merge remote-tracking branch 'upstream/master'","distinct":true,"url":"https://api.github.com/repos/nwoeanhinnogaehr/Team15Alpha/commits/c7686a9c5f55adfc4ac85c5ccda2ecaae4683f42"},{"sha":"1fbc51320069798db364f848f11341f453f2c625","author":{"email":"99685b1bdbf276e116404513ca523b382b337e9d@ualberta.ca","name":"Stephen"},"message":"Merge branch 'master' of https://github.com/CMPUT301F15T15/Team15Alpha\n\nConflicts:\n\tSkill/app/src/main/java/com/skilltradiez/skilltraderz/GeneralMenuActivity.java","distinct":true,"url":"https://api.github.com/repos/nwoeanhinnogaehr/Team15Alpha/commits/1fbc51320069798db364f848f11341f453f2c625"},{"sha":"be8080045ba4c2ca7380fab8bf409da5ebf902e7","author":{"email":"99685b1bdbf276e116404513ca523b382b337e9d@ualberta.ca","name":"Stephen"},"message":"Merge branch 'master' of https://github.com/CMPUT301F15T15/Team15Alpha","distinct":true,"url":"https://api.github.com/repos/nwoeanhinnogaehr/Team15Alpha/commits/be8080045ba4c2ca7380fab8bf409da5ebf902e7"},{"sha":"2b040c6c345cb9df11df193d2b9fd7cb9f89e20b","author":{"email":"3fb6c4d721d441e2197e0e1274f6cdea3c505288@ualberta.ca","name":"ctevans"},"message":"proper javadoc comments ahoy.","distinct":true,"url":"https://api.github.com/repos/nwoeanhinnogaehr/Team15Alpha/commits/2b040c6c345cb9df11df193d2b9fd7cb9f89e20b"},{"sha":"46177f4b73fa187028d1e680e437c29bf5b4948c","author":{"email":"3fb6c4d721d441e2197e0e1274f6cdea3c505288@ualberta.ca","name":"ctevans"},"message":"Merge remote-tracking branch 'upstream/master'","distinct":true,"url":"https://api.github.com/repos/nwoeanhinnogaehr/Team15Alpha/commits/46177f4b73fa187028d1e680e437c29bf5b4948c"},{"sha":"a14e43c17b05ee3a0561117990fd2c6db0e7ee36","author":{"email":"ce8b1e915348dcaaf1d063ed2e3f436ce3e29039@users.noreply.github.com","name":"Noah Weninger"},"message":"Merge pull request #205 from FancifulEight/master\n\nSZ icon fixed","distinct":true,"url":"https://api.github.com/repos/nwoeanhinnogaehr/Team15Alpha/commits/a14e43c17b05ee3a0561117990fd2c6db0e7ee36"},{"sha":"360af5766c3c4e9dd5b4f46963a1873e0aa5575a","author":{"email":"ce8b1e915348dcaaf1d063ed2e3f436ce3e29039@users.noreply.github.com","name":"Noah Weninger"},"message":"Merge pull request #206 from ctevans/master\n\nLet's make sure the javadoc comments don't unleash hell.","distinct":true,"url":"https://api.github.com/repos/nwoeanhinnogaehr/Team15Alpha/commits/360af5766c3c4e9dd5b4f46963a1873e0aa5575a"},{"sha":"eea851f61b590480ff89f5ec6bba87ed982073c3","author":{"email":"13ed3ef02e7fbdb7509bbc0b23d185a071a3a464@ualberta.ca","name":"Noah Weninger"},"message":"Merge branch 'master' of github.com:CMPUT301F15T15/Team15Alpha\n\n# Conflicts:\n#\tSkill/app/src/main/java/com/skilltradiez/skilltraderz/CameraActivity.java\n#\tSkill/app/src/main/java/com/skilltradiez/skilltraderz/EditSkillActivity.java","distinct":true,"url":"https://api.github.com/repos/nwoeanhinnogaehr/Team15Alpha/commits/eea851f61b590480ff89f5ec6bba87ed982073c3"}]}