Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/kmrshntr/omniauth-slack
Browse files Browse the repository at this point in the history 
Conflicts:
	lib/omniauth/strategies/slack.rb
  • Loading branch information
@kmrshntr
kmrshntr committed Dec 24, 2014
2 parents ed715d6 + c2d4051 commit 69e7855
Showing 0 changed files with 0 additions and 0 deletions.

0 comments on commit 69e7855

Please sign in to comment.