Merge branch 'dev'

PygmySlowLoris · Aug 22, 2017 · 2a17449 · 2a17449
2 parents 704b19c + 19bfd53
commit 2a17449
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/README.md b/README.md
@@ -44,6 +44,7 @@ And
 |  `main-icon`       | String    | <b>Default 'add'</b> <br>Use icons from the material icon library.  |
 |  `main-tooltip`       | String    | <b>Default `null`</b>  |
 |  `actions`            | Object    | <b>[Details bellow](https://github.com/PygmySlowLoris/vue-fab/#actions)</b>
+|  `fixed-tooltip`      | Boolean    | <b>Default 'false'</b><br> if true, it shows the tooltip beside the actions
 
 ### actions