Merge branch 'master' of https://github.com/blackle/mastodon into blackle-master

2017-04-11 20:43:56 +02:00 · 2017-04-11 20:43:56 +02:00 · 2a7602cad4
commit 2a7602cad4
parent b723ee73fc 06444bf050
16 changed files with 144 additions and 18 deletions
--- a/app/assets/javascripts/components/components/status.jsx
+++ b/app/assets/javascripts/components/components/status.jsx
@ -27,6 +27,7 @@ const Status = React.createClass({
    onOpenMedia: React.PropTypes.func,
    onBlock: React.PropTypes.func,
    me: React.PropTypes.number,
+    boostModal: React.PropTypes.bool,
    muted: React.PropTypes.bool
  },