]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 901b95e b60cf21)
Merge remote-tracking branch 'upstream/develop' into 1510-diaspora-privacy
authorMichael Vogel <icarus@dabo.de>
Tue, 6 Oct 2015 05:41:09 +0000 (07:41 +0200)
committerMichael Vogel <icarus@dabo.de>
Tue, 6 Oct 2015 05:41:09 +0000 (07:41 +0200)
1  2 
mod/follow.php patch | diff1 | diff2 | blob | history
mod/notifications.php patch | diff1 | diff2 | blob | history

diff --cc mod/follow.php
Simple merge
diff --cc mod/notifications.php
Simple merge
Unnamed repository; edit this file 'description' to name the repository.