Merge branch 'fabrizio1.0'

Conflicts:
	documentation/api/Authentication.markdown
	documentation/contribute/Readme.markdown
	documentation/faq/Faq.markdown
This commit is contained in:
Jaisen Mathai 2013-03-14 16:17:39 -07:00
commit c6db64b8cd
402 changed files with 45881 additions and 4075 deletions

View file

@ -48,7 +48,7 @@ _Authentication: optional_
<a name="example-cli"></a>
#### Command Line (using [openphoto-php][openphoto-php])
./openphoto -p -h current.openphoto.me -e /photos/list.json -F 'tags=sunnyvale'
./openphoto -p -h current.trovebox.com -e /photos/list.json -F 'tags=sunnyvale'
<a name="example-php"></a>
#### PHP (using [openphoto-php][openphoto-php])