Merge branch 'master' of github.com:photo/frontend

Conflicts:
	documentation/api/Authentication.markdown
	documentation/contribute/Readme.markdown
	documentation/faq/Faq.markdown
This commit is contained in:
Jaisen Mathai 2013-03-14 16:19:18 -07:00
commit 110f77eaa7
4 changed files with 8 additions and 9 deletions

View file

@ -3,8 +3,8 @@ Authentication using OAuth 1.0a
### Using OAuth (1.0a)
A full introduction to OAuth is beyond the scope of the Trovebox documentation.
In all reality you probably don't need to understand the ins and outs of OAuth, just grab one of our libraries.
A full introduction to OAuth is beyond the scope of the OpenPhoto documentation.
In all reality you probably don't need to understand all the ins and outs of OAuth; just grab one of our libraries and start building.
* <a href="https://github.com/photo/openphoto-php">openphoto/openphoto-php</a> - Our PHP language binding.
* <a href="https://github.com/photo/openphoto-ruby">openphoto/openphoto-ruby</a> - Our Ruby language binding.