diff options
| author | Christopher Speller <crspeller@gmail.com> | 2015-08-14 15:13:04 -0400 |
|---|---|---|
| committer | Christopher Speller <crspeller@gmail.com> | 2015-08-14 15:13:04 -0400 |
| commit | 9036dd99aa8ba2d9cdd6066a833862bbd9e2653a (patch) | |
| tree | 41a18a9bcbbcc7cd961cc424878ac37aade5c288 /web/static/js/marked/LICENSE | |
| parent | b9aef9f2a6b90663cb7ba4ff9e42560c145b631d (diff) | |
| parent | 26a8e19a357aee9e1b39623e604ce92bdfaa00df (diff) | |
| download | chat-9036dd99aa8ba2d9cdd6066a833862bbd9e2653a.tar.gz chat-9036dd99aa8ba2d9cdd6066a833862bbd9e2653a.tar.bz2 chat-9036dd99aa8ba2d9cdd6066a833862bbd9e2653a.zip | |
Merge pull request #382 from mattermost/revert-360-mm-375d
Revert "MM-375 Adds text formatting features using a modified version…
Diffstat (limited to 'web/static/js/marked/LICENSE')
| -rw-r--r-- | web/static/js/marked/LICENSE | 19 |
1 files changed, 0 insertions, 19 deletions
diff --git a/web/static/js/marked/LICENSE b/web/static/js/marked/LICENSE deleted file mode 100644 index a7b812ed6..000000000 --- a/web/static/js/marked/LICENSE +++ /dev/null @@ -1,19 +0,0 @@ -Copyright (c) 2011-2014, Christopher Jeffrey (https://github.com/chjj/) - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -THE SOFTWARE. |