{"shas":[["254a3bfe70867831c1cbcd21cb5e11dcf1da9d8c","79069711144d44b4f370f4b55eb7351cb7917547@jux.com","Merge branch 'p-master' into merged\n\nConflicts:\n\tlib/oauth/models/consumers/token.rb\n\toauth-plugin.gemspec","Aidan Feldman"],["17ac500a1ed55c398f73d63958fdc7ca19afed52","79069711144d44b4f370f4b55eb7351cb7917547@jux.com","Merge branch 'merged'\n\nConflicts:\n\tlib/oauth/models/consumers/token.rb","Aidan Feldman"]],"repo":"afeld/oauth-plugin","actor":"afeld","ref":"refs/heads/master","size":2,"head":"17ac500a1ed55c398f73d63958fdc7ca19afed52","actor_gravatar":"5e6ceef905d14ade228ea22c445d57bc","push_id":28319902}