# Conflicts: # apps/documenteditor/mobile/app/view/Settings.js # apps/documenteditor/mobile/locale/en.json |
||
|---|---|---|
| .. | ||
| add | ||
| edit | ||
| DocumentHolder.js | ||
| Editor.js | ||
| Main.js | ||
| Search.js | ||
| Settings.js | ||
| Toolbar.js | ||
# Conflicts: # apps/documenteditor/mobile/app/view/Settings.js # apps/documenteditor/mobile/locale/en.json |
||
|---|---|---|
| .. | ||
| add | ||
| edit | ||
| DocumentHolder.js | ||
| Editor.js | ||
| Main.js | ||
| Search.js | ||
| Settings.js | ||
| Toolbar.js | ||