Merge remote-tracking branch 'origin/develop' into develop
This commit is contained in:
commit
b84b3ccbdd
|
@ -207,7 +207,6 @@ require([
|
|||
,'common/main/lib/controller/Protection'
|
||||
,'common/main/lib/controller/Themes'
|
||||
,'common/main/lib/controller/Desktop'
|
||||
,'../../../../sdkjs/common/device_scale'
|
||||
], function() {
|
||||
app.start();
|
||||
});
|
||||
|
|
|
@ -305,6 +305,7 @@
|
|||
<inline src="resources/img/recent-file.svg" />
|
||||
<inline src="resources/img/file-template.svg" />
|
||||
<inline src="resources/img/blank.svg" />
|
||||
<script src="../../../../../../sdkjs/common/device_scale.js?__inline=true"></script>
|
||||
<script data-main="app" src="../../../vendor/requirejs/require.js"></script>
|
||||
|
||||
</body>
|
||||
|
|
|
@ -191,7 +191,6 @@ require([
|
|||
,'common/main/lib/controller/Protection'
|
||||
,'common/main/lib/controller/Themes'
|
||||
,'common/main/lib/controller/Desktop'
|
||||
,'../../../../sdkjs/common/device_scale'
|
||||
], function() {
|
||||
app.start();
|
||||
});
|
||||
|
|
|
@ -360,6 +360,7 @@
|
|||
<inline src="resources/img/recent-file.svg" />
|
||||
<inline src="resources/img/file-template.svg" />
|
||||
|
||||
<script src="../../../../../../sdkjs/common/device_scale.js?__inline=true"></script>
|
||||
<script data-main="app" src="../../../vendor/requirejs/require.js"></script>
|
||||
|
||||
</body>
|
||||
|
|
|
@ -203,7 +203,6 @@ require([
|
|||
,'common/main/lib/controller/Protection'
|
||||
,'common/main/lib/controller/Themes'
|
||||
,'common/main/lib/controller/Desktop'
|
||||
,'../../../../sdkjs/common/device_scale'
|
||||
], function() {
|
||||
app.start();
|
||||
});
|
||||
|
|
|
@ -365,6 +365,7 @@
|
|||
<inline src="resources/img/recent-file.svg" />
|
||||
<inline src="resources/img/file-template.svg" />
|
||||
|
||||
<script src="../../../../../../sdkjs/common/device_scale.js?__inline=true"></script>
|
||||
<script data-main="app" src="../../../vendor/requirejs/require.js"></script>
|
||||
</body>
|
||||
</html>
|
Loading…
Reference in a new issue