]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b3d33ee 584cf75)
Merge remote-tracking branch 'upstream/develop' into rewrites/app_get_baseurl_static
authorRoland Häder <roland@mxchange.org>
Thu, 22 Dec 2016 08:06:00 +0000 (09:06 +0100)
committerRoland Häder <roland@mxchange.org>
Thu, 22 Dec 2016 08:06:00 +0000 (09:06 +0100)
1  2 
mod/notifications.php patch | diff1 | diff2 | blob | history

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