diff options
author | Joram Wilander <jwawilander@gmail.com> | 2015-08-18 12:09:42 -0400 |
---|---|---|
committer | Joram Wilander <jwawilander@gmail.com> | 2015-08-18 12:09:42 -0400 |
commit | 44464f8f3c99ea4bae744a45e2924330a72f9b17 (patch) | |
tree | 8ad4d7f3c5f5553e8ab7c0e5a238b1fd1bbbee03 /web/react/pages | |
parent | 78c4bff0c179a952920d167378234bff847682fc (diff) | |
parent | 8fa7a4251a671ebe7056fe77df246e0f9e061a5b (diff) | |
download | chat-44464f8f3c99ea4bae744a45e2924330a72f9b17.tar.gz chat-44464f8f3c99ea4bae744a45e2924330a72f9b17.tar.bz2 chat-44464f8f3c99ea4bae744a45e2924330a72f9b17.zip |
Merge pull request #395 from mattermost/merge-fix
Fix a bad merge that had edited posts being handled sloppily.
Diffstat (limited to 'web/react/pages')
0 files changed, 0 insertions, 0 deletions