GitHub PushEvent at 2014-10-30 12:17:31
Repository: amber_website
Actor: salman-mehmood
Payload: {"shas":[["cdba59d451dcc231fbd1381210253b049d158742","48816edf8ab7dbcf04d0b9f26d1d2cfa541d48b6@gmail.com","Merge branch 'master' of https://github.com/mustafazaki/amber_website\n\nConflicts:\n\tCommon/css/imports/_fontface.scss\n\tCommon/css/style.css\n\tCommon/css/style.css.map","salman-mehmood",true],["42a8d73cf8aaad1658d3fe0cfcb751ab5b3ec84c","48816edf8ab7dbcf04d0b9f26d1d2cfa541d48b6@gmail.com","Merge branch 'master' of https://github.com/mustafazaki/amber_website\n\nConflicts:\n\tCommon/css/imports/_fontface.scss\n\tCommon/css/style.css\n\tCommon/css/style.css.map","salman-mehmood",true],["c3dd819d3024a4ac1ce87cb1fa6ce7b93caae4fb","48816edf8ab7dbcf04d0b9f26d1d2cfa541d48b6@gmail.com","Merge remote-tracking branch 'origin/master'\n\nConflicts:\n\tCommon/css/style.css.map","salman-mehmood",true],["943252b03c0092d67c6e792f81f15b40e8edaf03","48816edf8ab7dbcf04d0b9f26d1d2cfa541d48b6@gmail.com","Merge branch 'master' of https://github.com/mustafazaki/amber_website\n\nConflicts:\n\tCommon/css/imports/_fontface.scss\n\tCommon/css/style.css\n\tCommon/css/style.css.map","salman-mehmood",true]],"size":4,"ref":"refs/heads/master","head":"943252b03c0092d67c6e792f81f15b40e8edaf03"}