]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a539455 a539455)
Merge event-attendance into develop
authorrabuzarus <trebor@central-unit>
Sun, 11 Oct 2015 17:28:54 +0000 (19:28 +0200)
committerrabuzarus <trebor@central-unit>
Sun, 11 Oct 2015 17:28:54 +0000 (19:28 +0200)
Conflicts:
include/conversation.php


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