]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ff45944 0ae6f57)
Merge branch 'develop' into task/admin-block-list
authorHypolite Petovan <mrpetovan@gmail.com>
Fri, 1 Dec 2017 05:51:02 +0000 (00:51 -0500)
committerGitHub <noreply@github.com>
Fri, 1 Dec 2017 05:51:02 +0000 (00:51 -0500)

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