mirror of https://github.com/friendica/friendica
Merge origin/20170316_-_fix_event_edit into 20170316_-_fix_event_edit
Conflicts: mod/events.php
This commit is contained in:
commit
d1d33dc79a
Conflicts: mod/events.php