]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8e15649 337aef8)
Merge geotag into develop
authorrabuzarus <trebor@central-unit>
Wed, 30 Sep 2015 10:37:20 +0000 (12:37 +0200)
committerrabuzarus <trebor@central-unit>
Wed, 30 Sep 2015 10:37:20 +0000 (12:37 +0200)
Conflicts:
mod/photos.php


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.