]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 31fffcf 3d614a0)
Merge remote-tracking branch 'upstream/develop' into 1508-vier-popup-menu
authorMichael Vogel <icarus@dabo.de>
Sun, 30 Aug 2015 08:44:29 +0000 (10:44 +0200)
committerMichael Vogel <icarus@dabo.de>
Sun, 30 Aug 2015 08:44:29 +0000 (10:44 +0200)
Conflicts:
mod/dfrn_notify.php


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