]> git.mxchange.org Git - friendica.git/commitdiff
Merge branch 'develop' into 20170316_-_fix_event_edit
authorHypolite Petovan <mrpetovan@gmail.com>
Mon, 20 Mar 2017 15:08:07 +0000 (11:08 -0400)
committerGitHub <noreply@github.com>
Mon, 20 Mar 2017 15:08:07 +0000 (11:08 -0400)
1  2 
mod/events.php

diff --cc mod/events.php
Simple merge