Merge branch 'master' into handle_create_local_tracks_errors_better

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
This commit is contained in:
tsareg 2016-05-27 11:29:23 +03:00
commit e257a3dfc9
2 changed files with 2 additions and 1 deletions

0
base.html Normal file
View File

View File

@ -1,11 +1,12 @@
<html itemscope itemtype="http://schema.org/Product" prefix="og: http://ogp.me/ns#" xmlns="http://www.w3.org/1999/html"> <html itemscope itemtype="http://schema.org/Product" prefix="og: http://ogp.me/ns#" xmlns="http://www.w3.org/1999/html">
<head> <head>
<!--#include virtual="base.html" -->
<!--#include virtual="title.html" --> <!--#include virtual="title.html" -->
<script> <script>
window.indexLoadedTime = window.performance.now(); window.indexLoadedTime = window.performance.now();
console.log("(TIME) index.html loaded:\t", indexLoadedTime); console.log("(TIME) index.html loaded:\t", indexLoadedTime);
</script> </script>
<script src="config.js?v=15"></script><!-- adapt to your needs, i.e. set hosts and bosh path --> <script><!--#include virtual="config.js" --></script><!-- adapt to your needs, i.e. set hosts and bosh path -->
<script src="utils.js?v=1"></script> <script src="utils.js?v=1"></script>
<!--#include virtual="connection_optimization/connection_optimization.html" --> <!--#include virtual="connection_optimization/connection_optimization.html" -->
<script src="connection_optimization/do_external_connect.js?v=1"></script> <script src="connection_optimization/do_external_connect.js?v=1"></script>