]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0879b46 8f7d191)
Merge origin/20170316_-_fix_event_edit into 20170316_-_fix_event_edit
authorrabuzarus <>
Mon, 20 Mar 2017 16:16:39 +0000 (17:16 +0100)
committerrabuzarus <>
Mon, 20 Mar 2017 16:16:39 +0000 (17:16 +0100)
Conflicts:
mod/events.php


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