Merge branch 'master' of https://stash.kopano.io/scm/koe/kopano_ol_extension_source

Browse Source

# Conflicts:
#	src/AcaciaZPushPlugin/AcaciaZPushPlugin/ZPush/ContactStringReplacer.cs

...

This commit is contained in:

Patrick Simpson

2017-10-25 09:56:13 +02:00

parent f8f4c4aaa5 b8e7a470ab

commit 6bffab3229

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