From 442d206186ccdaac2c001b21851c7b4726a15b4c Mon Sep 17 00:00:00 2001
From: Claude <longneck@scratchbook.ch>
Date: Tue, 2 Oct 2018 11:40:39 +0200
Subject: [PATCH] version 0.13.0

---
 README.md                            | 33 ++++++++++++++++++++++++++--
 htdocs/application/config/config.php |  2 +-
 2 files changed, 32 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 4027c34..d7f8bfc 100644
--- a/README.md
+++ b/README.md
@@ -24,9 +24,9 @@ Here are some features:
 Try it out
 ----------
 
-http://paste.scratchbook.ch/
+https://paste.scratchbook.ch/
 
-See an encrypted paste: http://paste.scratchbook.ch/view/1427473f#iP7p05DRH0BC72qQjxv01BjUeOmNV073
+See an encrypted paste: https://paste.scratchbook.ch/view/1427473f#iP7p05DRH0BC72qQjxv01BjUeOmNV073
 
 
 Prerequisites
@@ -81,6 +81,35 @@ In the folder doc/, you will find:
 Changelog
 ---------
 
+### Version 0.13.0:
+
+* Updated CodeIgniter to 3.1.9
+* Various improvements in the Docker setup
+* An automated Docker-build: https://hub.docker.com/r/claudehohl/stikked/
+* Reverted the "intelligent language switcher" back to a fixed language setting because of too many side-effects
+* Fixed encodings and decryption functionality in various themes
+* Various bugfixes and improvements
+
+#### Upgrade instructions
+
+Copy your htdocs/application/stikked.php config file away. Upload the new version. Copy it back.
+
+The language setting in config/stikked.php is back, you can set a fixed language:
+
+```php
+$config['language'] = 'english';
+```
+
+New config option: Content expiration.
+Sets the "Expires:"-header to make use of browser-caching
+Format: http://php.net/manual/en/function.strtotime.php
+Examples: '+10 seconds', '+1 year', '-1 week'
+Browser-caching is disabled when this option is not set.
+
+```php
+$config['content_expiration'] = '+1 week';
+```
+
 ### Version 0.12.0:
 
 * Updates ensuring the compatibility with PHP7:
diff --git a/htdocs/application/config/config.php b/htdocs/application/config/config.php
index e2e1ab6..7d2b164 100644
--- a/htdocs/application/config/config.php
+++ b/htdocs/application/config/config.php
@@ -24,7 +24,7 @@ $config['base_url']	= '';
 | So that we can track your version.
 |
 */
-$config['stikked_version'] = '0.12.0';
+$config['stikked_version'] = '0.13.0';
 
 /*
 |--------------------------------------------------------------------------