# Conflicts: # apps/presentationeditor/main/app/view/SlideSettings.js # apps/presentationeditor/mobile/app/controller/Toolbar.js # apps/presentationeditor/mobile/app/controller/edit/EditContainer.js # apps/presentationeditor/mobile/app/controller/edit/EditSlide.js |
||
|---|---|---|
| .. | ||
| app | ||
| locale | ||
| resources | ||
| app.js | ||
| app.reporter.js | ||
| app_dev.js | ||
| app_dev.reporter.js | ||
| index.html | ||
| index.html.deploy | ||
| index.reporter.html | ||
| index.reporter.html.deploy | ||
| index_loader.html | ||
| index_loader.html.deploy | ||