{"action":"created","issue":{"url":"https://api.github.com/repos/joemfb/docs/issues/4","repository_url":"https://api.github.com/repos/joemfb/docs","labels_url":"https://api.github.com/repos/joemfb/docs/issues/4/labels{/name}","comments_url":"https://api.github.com/repos/joemfb/docs/issues/4/comments","events_url":"https://api.github.com/repos/joemfb/docs/issues/4/events","html_url":"https://github.com/joemfb/docs/pull/4","id":160531135,"number":4,"title":"Merged glossary","user":{"login":"asgardiator","id":10970247,"avatar_url":"https://avatars.githubusercontent.com/u/10970247?v=3","gravatar_id":"","url":"https://api.github.com/users/asgardiator","html_url":"https://github.com/asgardiator","followers_url":"https://api.github.com/users/asgardiator/followers","following_url":"https://api.github.com/users/asgardiator/following{/other_user}","gists_url":"https://api.github.com/users/asgardiator/gists{/gist_id}","starred_url":"https://api.github.com/users/asgardiator/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/asgardiator/subscriptions","organizations_url":"https://api.github.com/users/asgardiator/orgs","repos_url":"https://api.github.com/users/asgardiator/repos","events_url":"https://api.github.com/users/asgardiator/events{/privacy}","received_events_url":"https://api.github.com/users/asgardiator/received_events","type":"User","site_admin":false},"labels":[],"state":"open","locked":false,"assignee":null,"milestone":null,"comments":2,"created_at":"2016-06-15T21:43:57Z","updated_at":"2016-06-16T03:02:57Z","closed_at":null,"pull_request":{"url":"https://api.github.com/repos/joemfb/docs/pulls/4","html_url":"https://github.com/joemfb/docs/pull/4","diff_url":"https://github.com/joemfb/docs/pull/4.diff","patch_url":"https://github.com/joemfb/docs/pull/4.patch"},"body":"1. catch joe/master up to urbit/master (prep for glossary add & contributions)\r\n2. fix all TODOs in current glossary"},"comment":{"url":"https://api.github.com/repos/joemfb/docs/issues/comments/226376730","html_url":"https://github.com/joemfb/docs/pull/4#issuecomment-226376730","issue_url":"https://api.github.com/repos/joemfb/docs/issues/4","id":226376730,"user":{"login":"asgardiator","id":10970247,"avatar_url":"https://avatars.githubusercontent.com/u/10970247?v=3","gravatar_id":"","url":"https://api.github.com/users/asgardiator","html_url":"https://github.com/asgardiator","followers_url":"https://api.github.com/users/asgardiator/followers","following_url":"https://api.github.com/users/asgardiator/following{/other_user}","gists_url":"https://api.github.com/users/asgardiator/gists{/gist_id}","starred_url":"https://api.github.com/users/asgardiator/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/asgardiator/subscriptions","organizations_url":"https://api.github.com/users/asgardiator/orgs","repos_url":"https://api.github.com/users/asgardiator/repos","events_url":"https://api.github.com/users/asgardiator/events{/privacy}","received_events_url":"https://api.github.com/users/asgardiator/received_events","type":"User","site_admin":false},"created_at":"2016-06-16T03:02:56Z","updated_at":"2016-06-16T03:02:56Z","body":"Oops, sorry about the mix-up. Branches are such a pain. I will get this in\nshape.\n\nOn Wed, Jun 15, 2016, 20:01 Joseph Bryan <notifications@github.com> wrote:\n\n> Thanks, @asgardiator <https://github.com/asgardiator>!\n>\n> I'm not gonna merge this right now; I'm kind of in a holding pattern.\n> @cgyarvin <https://github.com/cgyarvin> is editing separately, and we\n> probably don't want to diverge too much...\n>\n> Also, it looks like there's some problems on this branch; there are\n> conflict markers committed in the glossary, some of the link changes got\n> rolled back, etc. It'd be for the best if PRs contain only the deltas - you\n> could get there by rebasing your branch on top of mine (or cherry-picking\n> your commits into a new branch, if the rebase gets confused). And I don't\n> think there's any reason to merge master back into it, we can always rebase\n> this branch onto urbit/docs:master, maintaining a linear history.\n>\n> I'll leave this open, we can reconcile these changes once we see what else\n> has been done.\n>\n> —\n> You are receiving this because you were mentioned.\n> Reply to this email directly, view it on GitHub\n> <https://github.com/joemfb/docs/pull/4#issuecomment-226376490>, or mute\n> the thread\n> <https://github.com/notifications/unsubscribe/AKdkh_aatctMvQw7EDDV4PXt6aQmhgQXks5qMLxwgaJpZM4I201D>\n> .\n>\n"}}
{"actor":{"display_login":"asgardiator"}}