]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2fe80e0 558f9d2)
Merge branch 'develop' into task/admin-block-list
authorHypolite Petovan <mrpetovan@gmail.com>
Sat, 2 Dec 2017 02:39:20 +0000 (21:39 -0500)
committerHypolite Petovan <mrpetovan@gmail.com>
Sat, 2 Dec 2017 02:39:20 +0000 (21:39 -0500)

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