# Conflicts: # apps/common/mobile/resources/less/ios/icons.less # apps/common/mobile/resources/less/material/icons.less |
||
|---|---|---|
| .. | ||
| collaboration | ||
| Collaboration.js | ||
| ContextMenu.jsx | ||
| Plugins.js | ||
| Search.jsx | ||
# Conflicts: # apps/common/mobile/resources/less/ios/icons.less # apps/common/mobile/resources/less/material/icons.less |
||
|---|---|---|
| .. | ||
| collaboration | ||
| Collaboration.js | ||
| ContextMenu.jsx | ||
| Plugins.js | ||
| Search.jsx | ||