diff options
| author | Eliot Whalan <ewhal@pantsu.cat> | 2016-06-14 08:54:16 +0200 |
|---|---|---|
| committer | Eliot Whalan <ewhal@pantsu.cat> | 2016-06-14 08:54:16 +0200 |
| commit | 181238d1de4940b13bef7a9db24cac9dfc6e9770 (patch) | |
| tree | 94a7de90a3bf5168102fceb7767b16f8f626e253 | |
| parent | df89c55349f78b0303c2477223b0411522a3cc65 (diff) | |
Revert "CHANGELOG: Update 2.1.0 up to 99fe3f0"
This reverts commit d22eba66c03ad823298dfacfaeb86754ea47427f.
| -rw-r--r-- | CHANGELOG.md | 9 | ||||
| -rw-r--r-- | pages/tools.swig | 5 |
2 files changed, 9 insertions, 5 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 18ba511..59fe000 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -38,6 +38,15 @@ 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 diff --git a/pages/tools.swig b/pages/tools.swig index 3b02c89..01aa3dc 100644 --- a/pages/tools.swig +++ b/pages/tools.swig @@ -21,11 +21,6 @@ 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. #} -{# -This template is deprecated since version 2.1.0. It may be removed in a future -release. -#} - {% extends "layout.swig" %} {% block title %}Tools{% endblock %} |