summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristopher Speller <crspeller@gmail.com>2015-11-24 09:03:04 -0500
committerChristopher Speller <crspeller@gmail.com>2015-11-24 09:03:04 -0500
commit3bdd82f797e27bfbb7a01933ab4dafbb4359e627 (patch)
tree3a200ceb2edc65ef5729ae18d0ddcae0b90e0579
parent99cbbf45dcbfae93b86703c1ba24c5e763932f39 (diff)
parent165b3d4d38d801547e6afba8de46e7db1042804b (diff)
downloadchat-3bdd82f797e27bfbb7a01933ab4dafbb4359e627.tar.gz
chat-3bdd82f797e27bfbb7a01933ab4dafbb4359e627.tar.bz2
chat-3bdd82f797e27bfbb7a01933ab4dafbb4359e627.zip
Merge pull request #1504 from mattermost/lfbrock-patch-3
Update CHANGELOG.md
-rw-r--r--CHANGELOG.md4
1 files changed, 3 insertions, 1 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index b8f2faf81..595371fe6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -43,6 +43,8 @@ Many thanks to our external contributors. In no particular order:
- [jdhoek](https://github.com/jdhoek)
- [Tsynapse](https://github.com/Tsynapse)
- [alexgaribay](https://github.com/alexgaribay)
+- [vladikoff](https://github.com/vladikoff)
+- [jonathanwiesel](https://github.com/jonathanwiesel)
## Release v1.2.1
@@ -69,7 +71,7 @@ To limit the impact of this security issue, Mattermost v1.2.0 has been removed f
#### Syntax Highlighting
-- Syntax highlight for code blocks now available for `Diff, Apache, Makefile, HTTP, JSON, Markdown, Java, CSS, nginx, ObjectiveC, Python, XML, Perl, Bash, PHP, Coffee, C, SQL, Go, Ruby, Java, and ini`
+- Syntax highlight for code blocks now available for `Diff, Apache, Makefile, HTTP, JSON, Markdown, JavaScript, CSS, nginx, ObjectiveC, Python, XML, Perl, Bash, PHP, Coffee, C, SQL, Go, Ruby, Java, and ini`
#### Usability Improvements