]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e4c6cfd b580a33)
Merge remote-tracking branch 'upstream/develop' into 1607-is-result2
authorMichael Vogel <icarus@dabo.de>
Sat, 2 Jul 2016 12:01:52 +0000 (14:01 +0200)
committerMichael Vogel <icarus@dabo.de>
Sat, 2 Jul 2016 12:01:52 +0000 (14:01 +0200)
1  2 
include/ForumManager.php patch | diff1 | diff2 | blob | history

diff --cc include/ForumManager.php
Simple merge
Unnamed repository; edit this file 'description' to name the repository.