Merge branch 'master' into 149-front-page-design
# Conflicts: # javascript/src/iframe/viamapi-iframe.js
No related branches found
No related tags found
Showing
- Gopkg.toml 1 addition, 1 deletionGopkg.toml
- javascript/src/iframe/viamapi-iframe.js 473 additions, 531 deletionsjavascript/src/iframe/viamapi-iframe.js
- javascript/src/iframe/wopiapi-iframe.js 7 additions, 7 deletionsjavascript/src/iframe/wopiapi-iframe.js
- javascript/src/utilities/appUtility.js 12 additions, 0 deletionsjavascript/src/utilities/appUtility.js
- main.go 9 additions, 4 deletionsmain.go
Loading
Please register or sign in to comment