{"push_id":638351599,"size":1,"distinct_size":1,"ref":"refs/heads/master","head":"314c35bf1e4ea21def2c67f19769d461e6dbc1e3","before":"e75a52d4c472dbda634b4d118acbcfbb3ff4a5eb","commits":[{"sha":"314c35bf1e4ea21def2c67f19769d461e6dbc1e3","author":{"email":"9ef50458985ec73d89602aa848e0eb12b2b335a2@10.0.0.41","name":"Cameron"},"message":"Merge origin/master\n\nConflicts:\n\tsandbox/app/model/PlanetManager.php\n\tsandbox/app/presenters/HomepagePresenter.php\n\tsandbox/app/templates/components/main/content/galaxy.latte\n\tsandbox/temp/cache/Nette.Configurator/5264d15c575bdf56589bf9635d6cb720.php.meta\n\tsandbox/temp/cache/_Nette.RobotLoader/_634ca0392326c1b585708d9b19aa00e2\n\tsandbox/temp/cache/latte/Homepage-components-main-content-galaxy-latte-66d7ccb2d8b39093687336ded5dd6a77.php\n\tsandbox/temp/cache/latte/app-templates-Homepage-components-content-latte-2ad1ef155baf8e16ac6e1c255f8bd37e.php\n\tsandbox/temp/cache/latte/templates-Login-components-login-register-latte-5e6d3a74e856de47f6ac9de5ea94a6d4.php\n\tsandbox/temp/cache/latte/wamp-www-Nette-sandbox-app-templates-layout-latte-af9088fb0babc6d034803259a8d69b87.php","distinct":true,"url":"https://api.github.com/repos/cameroncz/Nette/commits/314c35bf1e4ea21def2c67f19769d461e6dbc1e3"}]}