{"push_id":976409521,"size":27,"distinct_size":22,"ref":"refs/heads/Assignment1-Dev","head":"b4452c8785b9120ec892150c5aff00fa37d673b0","before":"9c388af2f00357ac4f96a4915febeb4117e7e407","commits":[{"sha":"f55f905c2f42428750fb5cad82339ca54de7b7b6","author":{"email":"8eee6e344d4775415e2dc54165e0ca60020bb0f3@live.com","name":"Justin Walk"},"message":"Set up for bot assembly page","distinct":false,"url":"https://api.github.com/repos/haln/BotCardCollector/commits/f55f905c2f42428750fb5cad82339ca54de7b7b6"},{"sha":"bb0572306d4c531271de7693dab3566f6f28cadf","author":{"email":"8eee6e344d4775415e2dc54165e0ca60020bb0f3@live.com","name":"Justin Walk"},"message":"remove extra file","distinct":false,"url":"https://api.github.com/repos/haln/BotCardCollector/commits/bb0572306d4c531271de7693dab3566f6f28cadf"},{"sha":"f434c5de49db3755c2da8d972d43e5f91f108c4b","author":{"email":"8eee6e344d4775415e2dc54165e0ca60020bb0f3@live.com","name":"Justin Walk"},"message":"Merge remote-tracking branch 'refs/remotes/origin/Assignment1-Dev' into Assembly","distinct":false,"url":"https://api.github.com/repos/haln/BotCardCollector/commits/f434c5de49db3755c2da8d972d43e5f91f108c4b"},{"sha":"9d70d270beef19eef63fb149ec1a35f7f8216308","author":{"email":"8eee6e344d4775415e2dc54165e0ca60020bb0f3@live.com","name":"Justin Walk"},"message":"untested","distinct":false,"url":"https://api.github.com/repos/haln/BotCardCollector/commits/9d70d270beef19eef63fb149ec1a35f7f8216308"},{"sha":"05a247e5a979f327b2a9450a4ccc2c909fc5ea8e","author":{"email":"8eee6e344d4775415e2dc54165e0ca60020bb0f3@live.com","name":"Justin Walk"},"message":"Merge remote-tracking branch 'refs/remotes/origin/Assignment1-Dev' into Assembly\n\n# Conflicts:\n#\tapplication/config/autoload.php","distinct":false,"url":"https://api.github.com/repos/haln/BotCardCollector/commits/05a247e5a979f327b2a9450a4ccc2c909fc5ea8e"},{"sha":"95dc406241854fc470dcda92e2c7ed269fbbabe6","author":{"email":"8eee6e344d4775415e2dc54165e0ca60020bb0f3@live.com","name":"Justin Walk"},"message":"not working at all","distinct":true,"url":"https://api.github.com/repos/haln/BotCardCollector/commits/95dc406241854fc470dcda92e2c7ed269fbbabe6"},{"sha":"8dd6f85681b919ff7bb3123c5bdd9eebdb362abd","author":{"email":"8eee6e344d4775415e2dc54165e0ca60020bb0f3@live.com","name":"Justin Walk"},"message":"this is a nightmare","distinct":true,"url":"https://api.github.com/repos/haln/BotCardCollector/commits/8dd6f85681b919ff7bb3123c5bdd9eebdb362abd"},{"sha":"4615ca0172e1789b4c24b02e16caf72c26060e45","author":{"email":"02ca1d11d84f251c8db52f79cba7df2971a84d21@gmail.com","name":"Jimmi Lin"},"message":"Merge pull request #1 from FilthyCasuals/Assignment1-Dev\n\nupdate local dev","distinct":true,"url":"https://api.github.com/repos/haln/BotCardCollector/commits/4615ca0172e1789b4c24b02e16caf72c26060e45"},{"sha":"29a1c3d3db1e5f0dfbe06a2dc3dce0ece3368664","author":{"email":"527727ef63b451f72511f0c6bdddf506506c2c0e@live.cn","name":"evelyndai"},"message":"Merge remote-tracking branch 'FilthyCasuals/Assignment1-Dev' into Portfolio","distinct":true,"url":"https://api.github.com/repos/haln/BotCardCollector/commits/29a1c3d3db1e5f0dfbe06a2dc3dce0ece3368664"},{"sha":"e47fc0c192b29c9aa1727c8dceb1080555872ff7","author":{"email":"02ca1d11d84f251c8db52f79cba7df2971a84d21@gmail.com","name":"jimmilin"},"message":"Merge remote-tracking branch 'refs/remotes/FilthyCasuals/Assignment1-Dev' into Assignment1-Dev","distinct":true,"url":"https://api.github.com/repos/haln/BotCardCollector/commits/e47fc0c192b29c9aa1727c8dceb1080555872ff7"},{"sha":"e4987dc22f916146f4eed50d76a837b253d21e54","author":{"email":"a943bf4acc5ee168cf7551868541e44605017a3e@gmail.com","name":"Casper Co"},"message":"Framework for homepage\n\nGrabs information from database and displays it, albeit without any\nstyling.","distinct":true,"url":"https://api.github.com/repos/haln/BotCardCollector/commits/e4987dc22f916146f4eed50d76a837b253d21e54"},{"sha":"8ad004d071e70f116d6be8e16d07c5b379aeee32","author":{"email":"02ca1d11d84f251c8db52f79cba7df2971a84d21@gmail.com","name":"jimmilin"},"message":"allow individual page to use their own css over base.css","distinct":true,"url":"https://api.github.com/repos/haln/BotCardCollector/commits/8ad004d071e70f116d6be8e16d07c5b379aeee32"},{"sha":"5bba4e506c798adf28d8e3b2f79435101dbaab45","author":{"email":"02ca1d11d84f251c8db52f79cba7df2971a84d21@gmail.com","name":"jimmilin"},"message":"Merge branch 'Assignment1-Dev' of https://github.com/jimmilin/BotCardCollector into Assignment1-Dev","distinct":true,"url":"https://api.github.com/repos/haln/BotCardCollector/commits/5bba4e506c798adf28d8e3b2f79435101dbaab45"},{"sha":"9ebf81165478ca5d2963f8bed45cd02f4bd96f9c","author":{"email":"8eee6e344d4775415e2dc54165e0ca60020bb0f3@live.com","name":"Justin Walk"},"message":"Merge pull request #9 from haln/homepage-dev\n\nHomepage dev","distinct":true,"url":"https://api.github.com/repos/haln/BotCardCollector/commits/9ebf81165478ca5d2963f8bed45cd02f4bd96f9c"},{"sha":"916719ad366f2cf4c2a0a7dfbfaf09240ae6bbfd","author":{"email":"8eee6e344d4775415e2dc54165e0ca60020bb0f3@live.com","name":"Justin Walk"},"message":"Merge pull request #10 from jimmilin/Assignment1-Dev\n\nallow individual to use their own css","distinct":true,"url":"https://api.github.com/repos/haln/BotCardCollector/commits/916719ad366f2cf4c2a0a7dfbfaf09240ae6bbfd"},{"sha":"0036c1d215c228d83bcab0297901f64a414a8085","author":{"email":"527727ef63b451f72511f0c6bdddf506506c2c0e@live.cn","name":"evelyndai"},"message":"Merge remote-tracking branch 'FilthyCasuals/Assignment1-Dev' into Portfolio","distinct":true,"url":"https://api.github.com/repos/haln/BotCardCollector/commits/0036c1d215c228d83bcab0297901f64a414a8085"},{"sha":"55d79ce05f9c8b581e66ec6eef7f9917b10aeac6","author":{"email":"8eee6e344d4775415e2dc54165e0ca60020bb0f3@live.com","name":"Justin Walk"},"message":"Merge remote-tracking branch 'refs/remotes/origin/Assignment1-Dev' into Assembly\n\n# Conflicts:\n#\tapplication/core/main_Controller.php","distinct":true,"url":"https://api.github.com/repos/haln/BotCardCollector/commits/55d79ce05f9c8b581e66ec6eef7f9917b10aeac6"},{"sha":"ee7b5ed311599c508cf54d3fc7e9ff590007ff23","author":{"email":"8eee6e344d4775415e2dc54165e0ca60020bb0f3@live.com","name":"Justin Walk"},"message":"Merge pull request #11 from FilthyCasuals/Assembly\n\nAssembly","distinct":true,"url":"https://api.github.com/repos/haln/BotCardCollector/commits/ee7b5ed311599c508cf54d3fc7e9ff590007ff23"},{"sha":"4f5a91a9356817cb24501fa0553b1a72fcde7b5b","author":{"email":"527727ef63b451f72511f0c6bdddf506506c2c0e@live.cn","name":"evelyndai"},"message":"Merge remote-tracking branch 'FilthyCasuals/Assignment1-Dev' into Portfolio","distinct":true,"url":"https://api.github.com/repos/haln/BotCardCollector/commits/4f5a91a9356817cb24501fa0553b1a72fcde7b5b"},{"sha":"22d092c6b5ca4695c9ba5e59d8e55fba5dffcadc","author":{"email":"527727ef63b451f72511f0c6bdddf506506c2c0e@live.cn","name":"evelyndai"},"message":"Solved conflict","distinct":true,"url":"https://api.github.com/repos/haln/BotCardCollector/commits/22d092c6b5ca4695c9ba5e59d8e55fba5dffcadc"}]}