# Conflicts: # apps/common/mobile/lib/view/Search.jsx # apps/common/mobile/resources/less/common-material.less |
||
|---|---|---|
| .. | ||
| add | ||
| edit | ||
| settings | ||
| ContextMenu.jsx | ||
| Error.jsx | ||
| LongActions.jsx | ||
| Main.jsx | ||
| Preview.jsx | ||
| Search.jsx | ||
| Toolbar.jsx | ||
# Conflicts: # apps/common/mobile/lib/view/Search.jsx # apps/common/mobile/resources/less/common-material.less |
||
|---|---|---|
| .. | ||
| add | ||
| edit | ||
| settings | ||
| ContextMenu.jsx | ||
| Error.jsx | ||
| LongActions.jsx | ||
| Main.jsx | ||
| Preview.jsx | ||
| Search.jsx | ||
| Toolbar.jsx | ||