summaryrefslogtreecommitdiffstats
path: root/LICENSE.txt
diff options
context:
space:
mode:
authorCarlos Tadeu Panato Junior <ctadeu@gmail.com>2017-04-09 00:29:18 +0200
committerJoram Wilander <jwawilander@gmail.com>2017-04-08 18:29:18 -0400
commit7b77bcf87e85330a1f7f0b2a2dcbf71326bf2fba (patch)
tree1025c8d28f509f9c19668bd8ab32ebdc92fceffe /LICENSE.txt
parenta3f5cffd4693446eecdc6f88ed336a4c35c1e708 (diff)
downloadchat-7b77bcf87e85330a1f7f0b2a2dcbf71326bf2fba.tar.gz
chat-7b77bcf87e85330a1f7f0b2a2dcbf71326bf2fba.tar.bz2
chat-7b77bcf87e85330a1f7f0b2a2dcbf71326bf2fba.zip
Small text changes - trailing spaces and update year (#6022)
* remove trailing spaces * update year
Diffstat (limited to 'LICENSE.txt')
-rw-r--r--LICENSE.txt22
1 files changed, 11 insertions, 11 deletions
diff --git a/LICENSE.txt b/LICENSE.txt
index e58757114..ead98cf01 100644
--- a/LICENSE.txt
+++ b/LICENSE.txt
@@ -1,32 +1,32 @@
Mattermost Licensing
-SOFTWARE LICENSING
+SOFTWARE LICENSING
-You are licensed to use compiled versions of the Mattermost platform produced by Mattermost, Inc. under an MIT LICENSE
+You are licensed to use compiled versions of the Mattermost platform produced by Mattermost, Inc. under an MIT LICENSE
- See MIT-COMPILED-LICENSE.md included in compiled versions for details
You may be licensed to use source code to create compiled versions not produced by Mattermost, Inc. in one of two ways:
-1. Under the Free Software Foundation’s GNU AGPL v.3.0, subject to the exceptions outlined in this policy; or
-2. Under a commercial license available from Mattermost, Inc. by contacting commercial@mattermost.com
+1. Under the Free Software Foundation’s GNU AGPL v.3.0, subject to the exceptions outlined in this policy; or
+2. Under a commercial license available from Mattermost, Inc. by contacting commercial@mattermost.com
-You are licensed to use the source code in Admin Tools and Configuration Files (templates/, config/, model/,
+You are licensed to use the source code in Admin Tools and Configuration Files (templates/, config/, model/,
webapp/client, webapp/fonts, webapp/i18n, webapp/images and all subdirectories thereof) under the Apache License v2.0.
-We promise that we will not enforce the copyleft provisions in AGPL v3.0 against you if your application (a) does not
+We promise that we will not enforce the copyleft provisions in AGPL v3.0 against you if your application (a) does not
link to the Mattermost Platform directly, but exclusively uses the Mattermost Admin Tools and Configuration Files, and
-(b) you have not modified, added to or adapted the source code of Mattermost in a way that results in the creation of
+(b) you have not modified, added to or adapted the source code of Mattermost in a way that results in the creation of
a “modified version” or “work based on” Mattermost as these terms are defined in the AGPL v3.0 license.
MATTERMOST TRADEMARK GUIDELINES
-Your use of the mark Mattermost is subject to Mattermost, Inc's prior written approval and our organization’s Trademark
-Standards of Use at http://www.mattermost.org/trademark-standards-of-use/. For trademark approval or any questions
-you have about using these trademarks, please email trademark@mattermost.com
+Your use of the mark Mattermost is subject to Mattermost, Inc's prior written approval and our organization’s Trademark
+Standards of Use at http://www.mattermost.org/trademark-standards-of-use/. For trademark approval or any questions
+you have about using these trademarks, please email trademark@mattermost.com
------------------------------------------------------------------------------------------------------------------------------
-
+
Apache License
Version 2.0, January 2004
http://www.apache.org/licenses/