]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3ffea45 92ad875)
Merge branch 'develop' into rewrites/dbm_is_result
authorRoland Häder <roland@mxchange.org>
Tue, 20 Dec 2016 10:06:07 +0000 (11:06 +0100)
committerRoland Häder <roland@mxchange.org>
Tue, 20 Dec 2016 10:06:07 +0000 (11:06 +0100)
Signed-off-by: Roland Häder <roland@mxchange.org>
Conflicts:
mod/events.php
mod/fbrowser.php
mod/group.php
view/theme/quattro/theme.php


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