]> git.mxchange.org Git - friendica.git/commit
projects / friendica.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(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)
commit35973b9273df73b92b840634ff021deb501e4221
tree789a43563bc9f9d586c25d4b5633fefe9969a7f0tree | snapshot
parent3ffea45a1cde04f371b7e2874f584113a5cdc1bccommit | diff
parent92ad87590bfa2ec146587f1764d0e04ed51e9b4ccommit | diff
Merge branch 'develop' into rewrites/dbm_is_result

Signed-off-by: Roland Häder <roland@mxchange.org>
Conflicts:
mod/events.php
mod/fbrowser.php
mod/group.php
view/theme/quattro/theme.php
Unnamed repository; edit this file 'description' to name the repository.