Skip to content
Snippets Groups Projects
Commit e9e10317 authored by Alexey Lunin's avatar Alexey Lunin
Browse files

Merge branch 'master' into exchange-2016-support

# Conflicts:
#	javascript/src/iframe/viamapi-iframe.js
parents a67c64cb 3112ea9d
No related branches found
No related tags found
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment