diff options
| author | Reed Garmsen <rgarmsen2295@gmail.com> | 2015-06-22 07:49:54 -0700 |
|---|---|---|
| committer | Reed Garmsen <rgarmsen2295@gmail.com> | 2015-06-22 07:49:54 -0700 |
| commit | e3a662a842f5012c58215f1ede771f491bb2dc48 (patch) | |
| tree | 50794a2875f495c17af038a87516b1126b532664 /web/react/components | |
| parent | 6c8d7b1b9fe00e60582900b7c1e782e2c0a00325 (diff) | |
| parent | 7253a6c689611c94141cecec64b37b7371a5cd00 (diff) | |
| download | chat-e3a662a842f5012c58215f1ede771f491bb2dc48.tar.gz chat-e3a662a842f5012c58215f1ede771f491bb2dc48.tar.bz2 chat-e3a662a842f5012c58215f1ede771f491bb2dc48.zip | |
Merge pull request #17 from mattermost/master
to me
Diffstat (limited to 'web/react/components')
| -rw-r--r-- | web/react/components/create_comment.jsx | 2 | ||||
| -rw-r--r-- | web/react/components/create_post.jsx | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/web/react/components/create_comment.jsx b/web/react/components/create_comment.jsx index 9bcbad079..cb7aa371c 100644 --- a/web/react/components/create_comment.jsx +++ b/web/react/components/create_comment.jsx @@ -145,7 +145,7 @@ module.exports = React.createClass({ onUserInput={this.handleUserInput} onKeyPress={this.commentMsgKeyPress} messageText={this.state.messageText} - createMessage="Create a comment..." + createMessage="Add a comment..." initialText="" id="reply_textbox" ref="textbox" /> diff --git a/web/react/components/create_post.jsx b/web/react/components/create_post.jsx index a534e495d..5a0b6f85f 100644 --- a/web/react/components/create_post.jsx +++ b/web/react/components/create_post.jsx @@ -248,7 +248,7 @@ module.exports = React.createClass({ onUserInput={this.handleUserInput} onKeyPress={this.postMsgKeyPress} messageText={this.state.messageText} - createMessage="Create a post..." + createMessage="Write a message..." channelId={this.state.channel_id} id="post_textbox" ref="textbox" /> |