Skip to content

Commit

Permalink
Merge branch 'master' into fix-issue-visjs#238
Browse files Browse the repository at this point in the history
  • Loading branch information
yotamberk authored Jan 18, 2020
2 parents 30e5e72 + 6335799 commit e05c250
Show file tree
Hide file tree
Showing 3 changed files with 326 additions and 151 deletions.
2 changes: 1 addition & 1 deletion docs/timeline/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -1153,7 +1153,7 @@ <h2 id="Configuration_Options">Configuration Options</h2>
<td class="indent">cluster.titleTemplate</td>
<td>string or null</td>
<td><code>none</code></td>
<td>Cluster item tooltip</td>
<td>Cluster item tooltip, will replace <code>{count}</code> with the number of items in the cluster</td>
</tr>
<tr parent="cluster" class="hidden">
<td class="indent">cluster.clusterCriteria</td>
Expand Down
Loading

0 comments on commit e05c250

Please sign in to comment.