Merge origin/20170316_-_fix_event_edit into 20170316_-_fix_event_edit

Browse Source

Conflicts:
	mod/events.php

...

This commit is contained in:

rabuzarus

2017-03-20 17:16:39 +01:00

parent 0879b46125 8f7d191bfc

commit d1d33dc79a

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available