summaryrefslogtreecommitdiffstats
path: root/model
diff options
context:
space:
mode:
authorJoram Wilander <jwawilander@gmail.com>2015-08-18 12:09:42 -0400
committerJoram Wilander <jwawilander@gmail.com>2015-08-18 12:09:42 -0400
commit44464f8f3c99ea4bae744a45e2924330a72f9b17 (patch)
tree8ad4d7f3c5f5553e8ab7c0e5a238b1fd1bbbee03 /model
parent78c4bff0c179a952920d167378234bff847682fc (diff)
parent8fa7a4251a671ebe7056fe77df246e0f9e061a5b (diff)
downloadchat-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 'model')
0 files changed, 0 insertions, 0 deletions