Skip to content

Commit

Permalink
Merge branch 'merge-3.1.x' of github.com:CakeDC/users into alejandro
Browse files Browse the repository at this point in the history
  • Loading branch information
steinkel committed Feb 9, 2016
2 parents f145e81 + fa2eb52 commit 67a3658
Showing 1 changed file with 2 additions and 0 deletions.
2 changes: 2 additions & 0 deletions Docs/Documentation/SocialAuthenticate.md
Original file line number Diff line number Diff line change
Expand Up @@ -80,3 +80,5 @@ $this->User->twitterLogin();

We recommend the use of [Bootstrap Social](http://lipis.github.io/bootstrap-social/) in order to automatically apply styles to buttons. Anyway you can always add your own style to the buttons.

Social Authentication was inspired by [UseMuffin/OAuth2](https://github.com/UseMuffin/OAuth2) library.

0 comments on commit 67a3658

Please sign in to comment.