]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 497df57 eaf308a)
Merge develop into 20170316_-_fix_event_edit
authorrabuzarus <>
Mon, 20 Mar 2017 15:46:36 +0000 (16:46 +0100)
committerrabuzarus <>
Mon, 20 Mar 2017 15:46:36 +0000 (16:46 +0100)
Conflicts:
mod/events.php


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