Maxim Kadushkin 482a7d11bf Merge branch 'develop' into feature/desktop-new ...

# Conflicts:
#	apps/documenteditor/main/app/controller/Main.js
#	apps/documenteditor/main/app/controller/Toolbar.js
#	apps/presentationeditor/main/app/controller/Main.js
#	apps/spreadsheeteditor/main/app/controller/Main.js

2018-02-22 02:41:49 +03:00

..

resources/templates

webapps added

2016-03-10 21:48:53 -03:00

api.js

Merge branch 'develop' into feature/desktop-new

2018-02-22 02:41:49 +03:00

cache-scripts.html

add api config

2016-05-13 11:37:54 +03:00

index.html

Delete unused events and methods.

2017-04-11 17:09:00 +03:00

index.html.desktop

[common] added 'Desktop' controller

2018-02-22 02:24:03 +03:00