Merge remote-tracking branch 'origin/develop' into develop
This commit is contained in:
commit
a991960998
|
@ -71,7 +71,7 @@
|
||||||
<source src="media/busy.ogg" type="audio/ogg" />
|
<source src="media/busy.ogg" type="audio/ogg" />
|
||||||
<source src="media/busy.mp3" type="audio/mpeg" />
|
<source src="media/busy.mp3" type="audio/mpeg" />
|
||||||
</audio>
|
</audio>
|
||||||
<audio id="remoteAudio"/>
|
<audio id="remoteAudio"></audio>
|
||||||
<!-- let CSS themes pass constants to the app -->
|
<!-- let CSS themes pass constants to the app -->
|
||||||
<div id="mx_theme_accentColor"></div><div id="mx_theme_secondaryAccentColor"/></div><div id="mx_theme_tertiaryAccentColor"/></div>
|
<div id="mx_theme_accentColor"></div><div id="mx_theme_secondaryAccentColor"/></div><div id="mx_theme_tertiaryAccentColor"/></div>
|
||||||
</body>
|
</body>
|
||||||
|
|
Loading…
Reference in New Issue