Skip to content

Z
z-push
Commit 8c40c062 authored by Manfred Kutas's avatar Manfred Kutas
Browse files
Options

Merge remote-tracking branch 'origin/develop' into feature/ZP-1295-merge-mapi-classes-from-webapp 

Conflicts:
	src/backend/kopano/mapi/class.meetingrequest.php
	src/backend/kopano/mapi/class.taskrecurrence.php
	src/backend/kopano/mapi/class.taskrequest.php
parents 99039b35 8fedea77
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 0 deletions
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment