Merge branch 'master' into feature-kotlin

This commit is contained in:
fabian committed 2017-12-11 08:29:28 +01:00
commit 191b2fe05a
3 files changed
+24 -8

No files matched your search

@@ -164,11 +164,11 @@
});
</script>
<span id="heatmap" style="width: 500px; height: 600px;"></span>
<div id="heatmap" style="width: 500px; height: 600px;"></div>
{{#count.dialogs}}
<span id="chart_chat_types" style="width: 600px; height: 500px;"></span>
<div id="chart_chat_types" style="width: 600px; height: 500px;"></div>
{{/count.dialogs}}
<span id="chart_message_types" style="width: 600px; height: 500px;"></span>
<span id="chart_media_types" style="width: 600px; height: 500px;"></span>
<span id="chart_authors" style="width: 600px; height: 500px;"></span>
<div id="chart_message_types" style="width: 600px; height: 500px;"></div>
<div id="chart_media_types" style="width: 600px; height: 500px;"></div>
<div id="chart_authors" style="width: 600px; height: 500px;"></div>