{"push_id":1051085266,"size":20,"distinct_size":0,"ref":"refs/heads/search_feature","head":"3945a6a27c9772a72325cfa85f1ee129edb56033","before":"462a57684bf01d913d6aa057eef6643db95f0ba3","commits":[{"sha":"3df7c32173f9f9fecd3b84483da9ad44821b0fb9","author":{"email":"ea732d977e82a97eed7ad0183e129970aba911fe@gmail.com","name":"erinjordan24"},"message":"Merge remote-tracking branch 'refs/remotes/origin/master' into Prepages","distinct":false,"url":"https://api.github.com/repos/harrij15/SquareMeals/commits/3df7c32173f9f9fecd3b84483da9ad44821b0fb9"},{"sha":"bb27ff844fa59037e8283e83785cf2c289e5d3a0","author":{"email":"9d0583cc69f5a915b5876f6ba5c2d6693b145567@rpi.edu","name":"helei96"},"message":"Added the icon/logo. There are a few different versions but this is what I settled on. Tell me if you want a certain change.","distinct":false,"url":"https://api.github.com/repos/harrij15/SquareMeals/commits/bb27ff844fa59037e8283e83785cf2c289e5d3a0"},{"sha":"4e1301b554abec48ad1652ffbc1086a515e569bb","author":{"email":"ea732d977e82a97eed7ad0183e129970aba911fe@gmail.com","name":"erinjordan24"},"message":"Merge remote-tracking branch 'refs/remotes/origin/master' into Prepages","distinct":false,"url":"https://api.github.com/repos/harrij15/SquareMeals/commits/4e1301b554abec48ad1652ffbc1086a515e569bb"},{"sha":"2a0fa1adf7f4ebbb058e71ad5d5790f83e403c7b","author":{"email":"a03d3570ce442f8215d72ef4d4a268d8ce05e581@sdpsoftware.com","name":"Shreya"},"message":"feature","distinct":false,"url":"https://api.github.com/repos/harrij15/SquareMeals/commits/2a0fa1adf7f4ebbb058e71ad5d5790f83e403c7b"},{"sha":"e6a53fbcacddd13f91b7c500ea0620f3f3bc3cad","author":{"email":"a03d3570ce442f8215d72ef4d4a268d8ce05e581@sdpsoftware.com","name":"Shreya"},"message":"ProfilePage","distinct":false,"url":"https://api.github.com/repos/harrij15/SquareMeals/commits/e6a53fbcacddd13f91b7c500ea0620f3f3bc3cad"},{"sha":"bca0412a27514137a29653ca9165a4886da6908d","author":{"email":"a03d3570ce442f8215d72ef4d4a268d8ce05e581@sdpsoftware.com","name":"Shreya"},"message":"Fixed minor importing error","distinct":false,"url":"https://api.github.com/repos/harrij15/SquareMeals/commits/bca0412a27514137a29653ca9165a4886da6908d"},{"sha":"1b23d538c2ba9abcdfc9b418386f58c65024947d","author":{"email":"ea732d977e82a97eed7ad0183e129970aba911fe@gmail.com","name":"erinjordan24"},"message":"Added the Preferences Page and the Page to Edit Preferences","distinct":false,"url":"https://api.github.com/repos/harrij15/SquareMeals/commits/1b23d538c2ba9abcdfc9b418386f58c65024947d"},{"sha":"ffe2c2b52600107b906e46e5f316cba6e8d6cb73","author":{"email":"b4ecfc9c1da01e3acc0fa600757ef568963948e2@rpi.edu","name":"harrij15"},"message":"Added strings.xml","distinct":false,"url":"https://api.github.com/repos/harrij15/SquareMeals/commits/ffe2c2b52600107b906e46e5f316cba6e8d6cb73"},{"sha":"4e984ddb52d84b3da0bdf2491c2caf7ad99c01f5","author":{"email":"b4ecfc9c1da01e3acc0fa600757ef568963948e2@rpi.edu","name":"Jon Harris"},"message":"Update .gitignore","distinct":false,"url":"https://api.github.com/repos/harrij15/SquareMeals/commits/4e984ddb52d84b3da0bdf2491c2caf7ad99c01f5"},{"sha":"cdbc9e072d88441a44c334d9fe023abe635c6607","author":{"email":"b4ecfc9c1da01e3acc0fa600757ef568963948e2@rpi.edu","name":"Jon Harris"},"message":"Delete app.iml","distinct":false,"url":"https://api.github.com/repos/harrij15/SquareMeals/commits/cdbc9e072d88441a44c334d9fe023abe635c6607"},{"sha":"a9b62fbb46f44460c922ab0fff2d7912b0920675","author":{"email":"a03d3570ce442f8215d72ef4d4a268d8ce05e581@sdpsoftware.com","name":"patels13"},"message":"Added files via upload","distinct":false,"url":"https://api.github.com/repos/harrij15/SquareMeals/commits/a9b62fbb46f44460c922ab0fff2d7912b0920675"},{"sha":"d8d87f034a4d424e7c35e382254e11fecdd2bf2f","author":{"email":"b4ecfc9c1da01e3acc0fa600757ef568963948e2@rpi.edu","name":"Jon Harris"},"message":"Rename activity_main.xml to app/src/main/res/layout/activity_main.xml","distinct":false,"url":"https://api.github.com/repos/harrij15/SquareMeals/commits/d8d87f034a4d424e7c35e382254e11fecdd2bf2f"},{"sha":"e70e9f592f0e37ff44061e4fc8a4a9b95f51f248","author":{"email":"b4ecfc9c1da01e3acc0fa600757ef568963948e2@rpi.edu","name":"harrij15"},"message":"Finished merge","distinct":false,"url":"https://api.github.com/repos/harrij15/SquareMeals/commits/e70e9f592f0e37ff44061e4fc8a4a9b95f51f248"},{"sha":"838d64bb6e76a4f8a576ac79fc131829fee5ed34","author":{"email":"b4ecfc9c1da01e3acc0fa600757ef568963948e2@rpi.edu","name":"harrij15"},"message":"Added back app.iml\n\nWon't really affect merging so I added it back in","distinct":false,"url":"https://api.github.com/repos/harrij15/SquareMeals/commits/838d64bb6e76a4f8a576ac79fc131829fee5ed34"},{"sha":"ffc5d5335765dc2d35cc15c5e9b0da255b815f43","author":{"email":"b4ecfc9c1da01e3acc0fa600757ef568963948e2@rpi.edu","name":"harrij15"},"message":"Random commit","distinct":false,"url":"https://api.github.com/repos/harrij15/SquareMeals/commits/ffc5d5335765dc2d35cc15c5e9b0da255b815f43"},{"sha":"cad9b30b1d26aad15ac5eba8f0edcdfe49184f4e","author":{"email":"ea732d977e82a97eed7ad0183e129970aba911fe@gmail.com","name":"erinjordan24"},"message":"Merge remote-tracking branch 'refs/remotes/origin/Prepages'","distinct":false,"url":"https://api.github.com/repos/harrij15/SquareMeals/commits/cad9b30b1d26aad15ac5eba8f0edcdfe49184f4e"},{"sha":"2ea80de6926f63af571c9433fb4b73ee41750fac","author":{"email":"ea732d977e82a97eed7ad0183e129970aba911fe@gmail.com","name":"erinjordan24"},"message":"Revert \"Added the Preferences Page and the Page to Edit Preferences\"\n\nThis reverts commit 1b23d538c2ba9abcdfc9b418386f58c65024947d.","distinct":false,"url":"https://api.github.com/repos/harrij15/SquareMeals/commits/2ea80de6926f63af571c9433fb4b73ee41750fac"},{"sha":"be38ec96bdc8181f85af0386fcada96ed3f030b8","author":{"email":"ea732d977e82a97eed7ad0183e129970aba911fe@gmail.com","name":"erinjordan24"},"message":"Merge remote-tracking branch 'refs/remotes/origin/master' into Prepages","distinct":false,"url":"https://api.github.com/repos/harrij15/SquareMeals/commits/be38ec96bdc8181f85af0386fcada96ed3f030b8"},{"sha":"d80ba9caede9cab58205905d6ad376d821ab500c","author":{"email":"ea732d977e82a97eed7ad0183e129970aba911fe@gmail.com","name":"erinjordan24"},"message":"Merge remote-tracking branch 'refs/remotes/origin/master' into Prepages\n\n# Conflicts:\n#\tapp/src/main/res/values/strings.xml","distinct":false,"url":"https://api.github.com/repos/harrij15/SquareMeals/commits/d80ba9caede9cab58205905d6ad376d821ab500c"},{"sha":"3945a6a27c9772a72325cfa85f1ee129edb56033","author":{"email":"ea732d977e82a97eed7ad0183e129970aba911fe@gmail.com","name":"erinjordan24"},"message":"Merge remote-tracking branch 'refs/remotes/origin/Prepages'","distinct":false,"url":"https://api.github.com/repos/harrij15/SquareMeals/commits/3945a6a27c9772a72325cfa85f1ee129edb56033"}]}