Merge pull request #3418 from gerhard6380/develop

author Tobias Diekershoff <tobias.diekershoff@gmx.net>

Mon, 8 May 2017 04:56:24 +0000 (06:56 +0200)

committer GitHub <noreply@github.com>

Mon, 8 May 2017 04:56:24 +0000 (06:56 +0200)
author Tobias Diekershoff <tobias.diekershoff@gmx.net>
Mon, 8 May 2017 04:56:24 +0000 (06:56 +0200)
committer GitHub <noreply@github.com>
Mon, 8 May 2017 04:56:24 +0000 (06:56 +0200)
diff --cc doc/api.md
Simple merge
diff --cc include/Photo.php
Simple merge
diff --cc include/api.php
Simple merge
author	Tobias Diekershoff <tobias.diekershoff@gmx.net>
	Mon, 8 May 2017 04:56:24 +0000 (06:56 +0200)
committer	GitHub <noreply@github.com>
	Mon, 8 May 2017 04:56:24 +0000 (06:56 +0200)
		1	2
doc/api.md	patch \|	diff1 \|	diff2 \|	blob \| history
include/Photo.php	patch \|	diff1 \|	diff2 \|	blob \| history
include/api.php	patch \|	diff1 \|	diff2 \|	blob \| history