diff options
author | Christopher Speller <crspeller@gmail.com> | 2015-09-22 13:33:18 -0400 |
---|---|---|
committer | Christopher Speller <crspeller@gmail.com> | 2015-09-22 13:33:18 -0400 |
commit | e9a2c223f2f247a773d04c4c23417393ca75b3dc (patch) | |
tree | 06a1ffa6312e7337b8af29aa76a1389c4f7e8666 /web/react/components/user_settings | |
parent | 7c0388856d811521064d2bd4d1e39976ba806906 (diff) | |
parent | 6beadc0319d7fd58fb521fd3713a6a46cea8f3d1 (diff) | |
download | chat-e9a2c223f2f247a773d04c4c23417393ca75b3dc.tar.gz chat-e9a2c223f2f247a773d04c4c23417393ca75b3dc.tar.bz2 chat-e9a2c223f2f247a773d04c4c23417393ca75b3dc.zip |
Merge pull request #747 from mattermost/revert-742-plt289
Revert "PLT-289 Properly removed lingering references to emojify"
Diffstat (limited to 'web/react/components/user_settings')
0 files changed, 0 insertions, 0 deletions