{"push_id":971126775,"size":2,"distinct_size":2,"ref":"refs/heads/master","head":"c72b41a8ecd2f28d9a4cd7022fcde72618fcdcb8","before":"cb8cf63e643bf7190042579820375ca8f718deda","commits":[{"sha":"85ccebbf475fbf148e521d2f0cc9e76923703946","author":{"email":"cb48eb3559b3c1cfa0e83e93a57ce7174cdebd18@harmandeeps-MacBook-Pro.local","name":"harman litt"},"message":"added xml parsing","distinct":true,"url":"https://api.github.com/repos/jacksonfrc/droid-superstar-reborn-plus/commits/85ccebbf475fbf148e521d2f0cc9e76923703946"},{"sha":"c72b41a8ecd2f28d9a4cd7022fcde72618fcdcb8","author":{"email":"cb48eb3559b3c1cfa0e83e93a57ce7174cdebd18@harmandeeps-MacBook-Pro.local","name":"harman litt"},"message":"Merge branch 'master' of https://github.com/jacksonfrc/droid-superstar-reborn-plus\n\n# By Michael Gifford (4) and Jackson (3)\n# Via Jackson\n* 'master' of https://github.com/jacksonfrc/droid-superstar-reborn-plus:\n  Small changes to html Export\n  Right click properties unique for each category\n  Right Click -> Change element inner text is a new feature\n  Style changes.\n  Component property changes now only apply to element that has been right clicked\n  Exporting as an HTML project now works.\n  Right click channge bg colour on activeWorkspace works. Right click rotate works\n\nConflicts:\n\tapp/index.html\n\tapp/js/project.js","distinct":true,"url":"https://api.github.com/repos/jacksonfrc/droid-superstar-reborn-plus/commits/c72b41a8ecd2f28d9a4cd7022fcde72618fcdcb8"}]}