]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 329ab7d fd36e4e)
Merge branch 'develop' into semaphore_warning
authorAlexandre Alapetite <alexandre.alapetite@alexandra.dk>
Fri, 7 Jul 2017 15:49:52 +0000 (17:49 +0200)
committerAlexandre Alapetite <alexandre.alapetite@alexandra.dk>
Fri, 7 Jul 2017 15:49:52 +0000 (17:49 +0200)

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