]> git.mxchange.org Git - friendica.git/commit
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)
commit0060e2449e4f225436964a8203b706ddd3e0d01f
tree3d08a3a810c2efbd5c266bf58115c16a7a203ede
parent497df57ef7581855e3d813e6a07a3d584b91f1d9
parenteaf308ad0175824378155234255710dca4214167
Merge develop into 20170316_-_fix_event_edit

Conflicts:
mod/events.php