Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Don't call psm callbacks if current identity is god #68

Merged
merged 2 commits into from
Nov 12, 2013

Conversation

bjoerge
Copy link
Member

@bjoerge bjoerge commented Nov 12, 2013

No description provided.

bjoerge added a commit that referenced this pull request Nov 12, 2013
Don't call psm callbacks if current identity is god
@bjoerge bjoerge merged commit b7d79ae into master Nov 12, 2013
@bjoerge bjoerge deleted the bypass-callback-if-god branch November 12, 2013 09:40
bjoerge added a commit that referenced this pull request Nov 12, 2013
This reverts commit b7d79ae, reversing
changes made to 0fb344c.
bjoerge added a commit that referenced this pull request Nov 12, 2013
* master:
  Revert "Merge pull request #68 from bengler/bypass-callback-if-god"

Conflicts:
	api/v1/callbacks.rb
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant