GitHub PushEvent at 2014-04-21 16:47:49
Repository: DnDCity
Actor: capnregex
Payload: {"shas":[["9801d06b94029b5edf0fd73be73f504c2345c1de","adf79cf6bd6d8c48e970a424f72eea3316c0acb5@gmail.com","Buggy slideshow update WIP","dspstanky",false],["2370225427caa0b909ebdc7921f1ced07d49e1ee","adf79cf6bd6d8c48e970a424f72eea3316c0acb5@gmail.com","Merge branch 'dspstanky' of github.com:DnDCity/DnDCity into dspstanky","dspstanky",false],["3fa169d882e10e25021e8a5ba9d5ee1d6470640d","adf79cf6bd6d8c48e970a424f72eea3316c0acb5@gmail.com","Commit to pull master","dspstanky",false],["99c71a6f79a900e13f110f8122aa0f85f6aa0ec2","926a4fb8841c278c26f6a00808d4b5895f9f0576@gmail.com","Merge branch 'master' into dspstanky\n\nConflicts:\n\tapp/assets/stylesheets/framework_and_overrides.css.scss\n\tapp/assets/stylesheets/scaffolds.css.scss\n\tapp/views/home/index.html.haml","Robert Ferney",false],["bf63e74e16a5553b686f32f21084342dd25fcd53","926a4fb8841c278c26f6a00808d4b5895f9f0576@gmail.com","wip","Robert Ferney",true],["979e785d4e093cb9371ecfdf969397743364c2ec","926a4fb8841c278c26f6a00808d4b5895f9f0576@gmail.com","Merge branch 'master' into rob","Robert Ferney",true],["ddf7b6fcf95f6356a7692f8fbee8550171a583a1","926a4fb8841c278c26f6a00808d4b5895f9f0576@gmail.com","green","Robert Ferney",true]],"size":7,"ref":"refs/heads/rob","head":"ddf7b6fcf95f6356a7692f8fbee8550171a583a1"}