diff options
| author | Stan Hu <stanhu@gmail.com> | 2015-08-13 02:18:05 +0300 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2015-08-13 02:18:05 +0300 |
| commit | e956d116c5a5147f75ff2cfc8d061ed8d628c309 (patch) | |
| tree | 5e1c1ca0aaca8fc62724506b46a283224caa43f6 /CHANGELOG | |
| parent | 6a82c9f01868b419975409a6819aa88dd973240d (diff) | |
| parent | 013260e057068ecc1e5330156d95bb7fbe996575 (diff) | |
Merge branch 'more-markdown-extensions' into 'master'
markup_helper: detect .mkd and .mkdn as markdown
See merge request !1148
Diffstat (limited to 'CHANGELOG')
| -rw-r--r-- | CHANGELOG | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/CHANGELOG b/CHANGELOG index f09d66ed3f7..428355a052c 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -53,6 +53,7 @@ v 7.14.0 (unreleased) - Include branch/tag name in archive file and directory name - Add dropzone upload progress - Add a label for merged branches on branches page (Florent Baldino) + - Detect .mkd and .mkdn files as markdown (Ben Boeckel) v 7.13.3 - Fix bug causing Bitbucket importer to crash when OAuth application had been removed. |