a97c7fc4da
# 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 |
||
---|---|---|
.. | ||
collection | ||
controller | ||
model | ||
template | ||
view |