{"action":"created","issue":{"url":"https://api.github.com/repos/JulietaUla/Montserrat/issues/17","repository_url":"https://api.github.com/repos/JulietaUla/Montserrat","labels_url":"https://api.github.com/repos/JulietaUla/Montserrat/issues/17/labels{/name}","comments_url":"https://api.github.com/repos/JulietaUla/Montserrat/issues/17/comments","events_url":"https://api.github.com/repos/JulietaUla/Montserrat/issues/17/events","html_url":"https://github.com/JulietaUla/Montserrat/issues/17","id":180752915,"number":17,"title":"Merge back into master","user":{"login":"graphicore","id":393132,"avatar_url":"https://avatars.githubusercontent.com/u/393132?v=3","gravatar_id":"","url":"https://api.github.com/users/graphicore","html_url":"https://github.com/graphicore","followers_url":"https://api.github.com/users/graphicore/followers","following_url":"https://api.github.com/users/graphicore/following{/other_user}","gists_url":"https://api.github.com/users/graphicore/gists{/gist_id}","starred_url":"https://api.github.com/users/graphicore/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/graphicore/subscriptions","organizations_url":"https://api.github.com/users/graphicore/orgs","repos_url":"https://api.github.com/users/graphicore/repos","events_url":"https://api.github.com/users/graphicore/events{/privacy}","received_events_url":"https://api.github.com/users/graphicore/received_events","type":"User","site_admin":false},"labels":[],"state":"open","locked":false,"assignee":null,"assignees":[],"milestone":null,"comments":4,"created_at":"2016-10-03T21:33:41Z","updated_at":"2016-10-04T20:21:51Z","closed_at":null,"body":"Please take a look at: https://github.com/JulietaUla/Montserrat/network\r\n\r\nThere are unfortunately 4 commits in your master that happened without prior merging the work of @kalapi \r\nUnfortunately we cannot merge the branch of @kalapi (and mine) back into master, because of conflicts.\r\n\r\nI added the vendorID and I fixed the z.alt glyph.\r\n\r\nMy branch builds on Kalapis: https://github.com/graphicore/Montserrat/tree/mastering and I prepared it to get the ttf fonts into google fonts.\r\n\r\nWe should somehow merge the branches, however, I think the best approach at this point is to redo the missing changes on top of my branch and force push it to master.\r\n"},"comment":{"url":"https://api.github.com/repos/JulietaUla/Montserrat/issues/comments/251501469","html_url":"https://github.com/JulietaUla/Montserrat/issues/17#issuecomment-251501469","issue_url":"https://api.github.com/repos/JulietaUla/Montserrat/issues/17","id":251501469,"user":{"login":"graphicore","id":393132,"avatar_url":"https://avatars.githubusercontent.com/u/393132?v=3","gravatar_id":"","url":"https://api.github.com/users/graphicore","html_url":"https://github.com/graphicore","followers_url":"https://api.github.com/users/graphicore/followers","following_url":"https://api.github.com/users/graphicore/following{/other_user}","gists_url":"https://api.github.com/users/graphicore/gists{/gist_id}","starred_url":"https://api.github.com/users/graphicore/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/graphicore/subscriptions","organizations_url":"https://api.github.com/users/graphicore/orgs","repos_url":"https://api.github.com/users/graphicore/repos","events_url":"https://api.github.com/users/graphicore/events{/privacy}","received_events_url":"https://api.github.com/users/graphicore/received_events","type":"User","site_admin":false},"created_at":"2016-10-04T20:21:51Z","updated_at":"2016-10-04T20:21:51Z","body":"No, just your last 4 commits will be lost, and I think I re-did most of the changes. I can help you getting this done."}}
{"actor":{"display_login":"graphicore"}}