{"push_id":630467238,"size":14,"distinct_size":14,"ref":"refs/heads/master","head":"022135a9e96f55eb30425dbbf892855f59753559","before":"bc242914b3e814c33b6385ea16824e6bacbfd52d","commits":[{"sha":"75bf85f21f6dc1664583b127f344d75085190329","author":{"email":"df1147cbbc82c5b32f0642c78b4fe9a1a9e35fba@ycp.edu","name":"aroth4"},"message":"Merge branch 'master' of https://github.com/sbonner1/RateMyDrink","distinct":true,"url":"https://api.github.com/repos/jcoady9/RateMyDrink/commits/75bf85f21f6dc1664583b127f344d75085190329"},{"sha":"05356d526ecde68bf9b502fd1e046fe96004058f","author":{"email":"df1147cbbc82c5b32f0642c78b4fe9a1a9e35fba@ycp.edu","name":"aroth4"},"message":"merge","distinct":true,"url":"https://api.github.com/repos/jcoady9/RateMyDrink/commits/05356d526ecde68bf9b502fd1e046fe96004058f"},{"sha":"8b799842285968bab21491b3d9346209ec5d430e","author":{"email":"df1147cbbc82c5b32f0642c78b4fe9a1a9e35fba@ycp.edu","name":"aroth4"},"message":"merge, fixed some code","distinct":true,"url":"https://api.github.com/repos/jcoady9/RateMyDrink/commits/8b799842285968bab21491b3d9346209ec5d430e"},{"sha":"7d51b7fd1b9476d6f754e40eb9f33462840d0eb4","author":{"email":"df1147cbbc82c5b32f0642c78b4fe9a1a9e35fba@ycp.edu","name":"aroth4"},"message":"another merge","distinct":true,"url":"https://api.github.com/repos/jcoady9/RateMyDrink/commits/7d51b7fd1b9476d6f754e40eb9f33462840d0eb4"},{"sha":"972b7f4c67fceba307f8e83ec7fbbecd7308fa9a","author":{"email":"df1147cbbc82c5b32f0642c78b4fe9a1a9e35fba@ycp.edu","name":"aroth4"},"message":"fixed some code","distinct":true,"url":"https://api.github.com/repos/jcoady9/RateMyDrink/commits/972b7f4c67fceba307f8e83ec7fbbecd7308fa9a"},{"sha":"c7b6e731a38ced03482a81e8f484e0c204123190","author":{"email":"df1147cbbc82c5b32f0642c78b4fe9a1a9e35fba@ycp.edu","name":"aroth4"},"message":"merge","distinct":true,"url":"https://api.github.com/repos/jcoady9/RateMyDrink/commits/c7b6e731a38ced03482a81e8f484e0c204123190"},{"sha":"ed9a97fbb32e51478dd108f2ca525be3e27e7d73","author":{"email":"df1147cbbc82c5b32f0642c78b4fe9a1a9e35fba@ycp.edu","name":"aroth4"},"message":"Merge branch 'master' of https://github.com/sbonner1/RateMyDrink\n\nConflicts:\n\tbackend/build/classes/main/persist/DerbyDatabase$1.class\n\tbackend/build/classes/main/persist/DerbyDatabase$10.class\n\tbackend/build/classes/main/persist/DerbyDatabase$11.class\n\tbackend/build/classes/main/persist/DerbyDatabase$12.class\n\tbackend/build/classes/main/persist/DerbyDatabase$17.class\n\tbackend/build/classes/main/persist/DerbyDatabase$18.class\n\tbackend/build/classes/main/persist/DerbyDatabase$2.class\n\tbackend/build/classes/main/persist/DerbyDatabase$3.class\n\tbackend/build/classes/main/persist/DerbyDatabase$4.class\n\tbackend/build/classes/main/persist/DerbyDatabase$6.class\n\tbackend/build/classes/main/persist/DerbyDatabase$9.class\n\tbackend/build/classes/main/persist/DerbyDatabase.class\n\tbackend/build/libs/backend.war\n\tbackend/build/tmp/jettyRunWar/webapp/WEB-INF/classes/persist/DerbyDatabase$1.class\n\tbackend/build/tmp/jettyRunWar/webapp/WEB-INF/classes/persist/DerbyDatabase$10.class\n\tbackend/build/tmp/jettyRunWar/webapp/WEB-INF/classes/persist/DerbyDatabase$11.class\n\tbackend/build/tmp/jettyRunWar/webapp/WEB-INF/classes/persist/DerbyDatabase$12.class\n\tbackend/build/tmp/jettyRunWar/webapp/WEB-INF/classes/persist/DerbyDatabase$17.class\n\tbackend/build/tmp/jettyRunWar/webapp/WEB-INF/classes/persist/DerbyDatabase$18.class\n\tbackend/build/tmp/jettyRunWar/webapp/WEB-INF/classes/persist/DerbyDatabase$2.class\n\tbackend/build/tmp/jettyRunWar/webapp/WEB-INF/classes/persist/DerbyDatabase$3.class\n\tbackend/build/tmp/jettyRunWar/webapp/WEB-INF/classes/persist/DerbyDatabase$4.class\n\tbackend/build/tmp/jettyRunWar/webapp/WEB-INF/classes/persist/DerbyDatabase$6.class\n\tbackend/build/tmp/jettyRunWar/webapp/WEB-INF/classes/persist/DerbyDatabase$9.class\n\tbackend/build/tmp/jettyRunWar/webapp/WEB-INF/classes/persist/DerbyDatabase.class\n\tbackend/build/tmp/jettyRunWar/webapp/WEB-INF/lib/modelclasses.jar\n\tmodelclasses/build/classes/main/com/rateMyDrink/modelClasses/Liquor$1.class\n\tmodelclasses/build/classes/main/com/rateMyDrink/modelClasses/Liquor.class\n\tmodelclasses/build/libs/modelclasses.jar","distinct":true,"url":"https://api.github.com/repos/jcoady9/RateMyDrink/commits/ed9a97fbb32e51478dd108f2ca525be3e27e7d73"},{"sha":"bbc02eb871668085871a71e3a274925a73764042","author":{"email":"df1147cbbc82c5b32f0642c78b4fe9a1a9e35fba@ycp.edu","name":"aroth4"},"message":"Added the add mixed drink page and resources.\nKnown bug: Null pointer exception on spinners.","distinct":true,"url":"https://api.github.com/repos/jcoady9/RateMyDrink/commits/bbc02eb871668085871a71e3a274925a73764042"},{"sha":"c9afa073101be1434fcf7ac180269220fac3573c","author":{"email":"f1b22aeb9a100707565098dbb7841101cac6ce15@gmail.com","name":"Josh Coady"},"message":"removed dead code from Get****Async classes","distinct":true,"url":"https://api.github.com/repos/jcoady9/RateMyDrink/commits/c9afa073101be1434fcf7ac180269220fac3573c"},{"sha":"2b06488eff99ec20472255ec14a23a8424e1ba74","author":{"email":"f1b22aeb9a100707565098dbb7841101cac6ce15@gmail.com","name":"Josh Coady"},"message":"added return statements to MyServlet.java","distinct":true,"url":"https://api.github.com/repos/jcoady9/RateMyDrink/commits/2b06488eff99ec20472255ec14a23a8424e1ba74"},{"sha":"912ec2e393eecde8b65d2824be3dd46cab198a7e","author":{"email":"f1b22aeb9a100707565098dbb7841101cac6ce15@gmail.com","name":"Josh Coady"},"message":"fixed bug where App wasn't setting a new Drink's Type properly","distinct":true,"url":"https://api.github.com/repos/jcoady9/RateMyDrink/commits/912ec2e393eecde8b65d2824be3dd46cab198a7e"},{"sha":"ed12313a3b3d2748aae654f7bdf71d0c84d8a0c0","author":{"email":"f1b22aeb9a100707565098dbb7841101cac6ce15@gmail.com","name":"Josh Coady"},"message":"pulled/resolved merge confilcts with aroth4","distinct":true,"url":"https://api.github.com/repos/jcoady9/RateMyDrink/commits/ed12313a3b3d2748aae654f7bdf71d0c84d8a0c0"},{"sha":"1222ca807b7fb2a3fe9baa79d66fb927fd4d6d54","author":{"email":"f1b22aeb9a100707565098dbb7841101cac6ce15@gmail.com","name":"Josh Coady"},"message":"made AddMixedDrinkFragement scrollable","distinct":true,"url":"https://api.github.com/repos/jcoady9/RateMyDrink/commits/1222ca807b7fb2a3fe9baa79d66fb927fd4d6d54"},{"sha":"022135a9e96f55eb30425dbbf892855f59753559","author":{"email":"f1b22aeb9a100707565098dbb7841101cac6ce15@gmail.com","name":"Josh Coady"},"message":"can now post a new MixedDrink Object to database with app","distinct":true,"url":"https://api.github.com/repos/jcoady9/RateMyDrink/commits/022135a9e96f55eb30425dbbf892855f59753559"}]}