# Conflicts: # apps/documenteditor/mobile/app/view/Settings.js # apps/documenteditor/mobile/locale/en.json |
||
---|---|---|
.. | ||
app | ||
locale | ||
resources | ||
test | ||
app-dev.js | ||
app.js | ||
index.html | ||
index.html.deploy |
# Conflicts: # apps/documenteditor/mobile/app/view/Settings.js # apps/documenteditor/mobile/locale/en.json |
||
---|---|---|
.. | ||
app | ||
locale | ||
resources | ||
test | ||
app-dev.js | ||
app.js | ||
index.html | ||
index.html.deploy |