Skip to content

Commit

Permalink
Merge branch 'dev'
Browse files Browse the repository at this point in the history
  • Loading branch information
Edujugon committed Aug 22, 2017
2 parents 704b19c + 19bfd53 commit 2a17449
Showing 1 changed file with 1 addition and 0 deletions.
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down

0 comments on commit 2a17449

Please sign in to comment.