From: rabuzarus <trebor@central-unit>
Date: Wed, 30 Sep 2015 10:37:20 +0000 (+0200)
Subject: Merge geotag into develop
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=b6781f5e40eff8ddc714fb96207c0ddfa574d403;p=friendica.git

Merge geotag into develop

Conflicts:
	mod/photos.php
---

b6781f5e40eff8ddc714fb96207c0ddfa574d403