diff options
| author | Eliot Whalan <ewhal@pantsu.cat> | 2016-06-14 10:27:36 +0200 |
|---|---|---|
| committer | Eliot Whalan <ewhal@pantsu.cat> | 2016-06-14 10:27:36 +0200 |
| commit | b0ccd22c1c35bac16699282cad77e664f698126d (patch) | |
| tree | 16171e2659b90df81d433eaf7fc81be3bde2515e /CHANGELOG.md | |
| parent | f15d7ff284b89aab9846c4e9acf9dd833b8108ce (diff) | |
Remove reverted commits from changelog
Diffstat (limited to 'CHANGELOG.md')
| -rw-r--r-- | CHANGELOG.md | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 59fe000..18ba511 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -38,15 +38,6 @@ This project adheres to [Semantic Versioning](http://semver.org/). Lapinlampi) - Output buffering (`ob_start`). This feature may be removed in the next major version. (Juuso Lapinlampi) -<<<<<<< HEAD -======= -- JavaScript-free uploader (`nojs.html`). Use the upload API with external - tools. (Juuso Lapinlampi) -- Other services page (`other.swig`). This page may be removed in the - next major version. (Juuso Lapinlampi) -- HTML and text responses. Use other supported response types instead. - (Juuso Lapinlampi) ->>>>>>> parent of d22eba6... CHANGELOG: Update 2.1.0 up to 99fe3f0 ### Fixed |