aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Alexandre Alapetite <alexandre@alapetite.fr> 2018-09-08 11:46:46 +0200
committerGravatar Alexandre Alapetite <alexandre@alapetite.fr> 2018-09-08 11:46:46 +0200
commitf5215e5966b4bf952bb6d8d4bb3168b78ae5b7d8 (patch)
tree91a5c080c4b1478683e0e4ba92880ebe057afb12
parentde4db714f5d232a80877addd3214c0cd7197c8d4 (diff)
Changelog 2005
+ fix Docker readme version https://github.com/FreshRSS/FreshRSS/pull/2005
-rw-r--r--CHANGELOG.md5
-rw-r--r--Docker/README.md2
2 files changed, 4 insertions, 3 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 84e0e6460..d234eed8a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,9 +1,9 @@
# FreshRSS changelog
-## 2018-XX-XX FreshRSS 1.11.2-dev
+## 2018-09-XX FreshRSS 1.11.2-dev
* Features
- * New menu to mark selected articles (view) as unread[#1966](https://github.com/FreshRSS/FreshRSS/issues/1966)
+ * New menu to mark selected articles (view) as unread [#1966](https://github.com/FreshRSS/FreshRSS/issues/1966)
* Share with LinkedIn [#1960](https://github.com/FreshRSS/FreshRSS/pull/1960)
* Deployment
* Update Docker image to Alpine 3.8 with PHP 7.2 [#1956](https://github.com/FreshRSS/FreshRSS/pull/1956)
@@ -22,6 +22,7 @@
* Updated Korean [#1985](https://github.com/FreshRSS/FreshRSS/pull/1985)
* Mics.
* Auto-login after self user creation [#1928](https://github.com/FreshRSS/FreshRSS/issues/1928)
+ * Allow `-` in database name at install time [#2005](https://github.com/FreshRSS/FreshRSS/pull/2005)
## 2018-06-16 FreshRSS 1.11.1
diff --git a/Docker/README.md b/Docker/README.md
index 133e7c3b8..f2aa3db20 100644
--- a/Docker/README.md
+++ b/Docker/README.md
@@ -20,7 +20,7 @@ git clone https://github.com/FreshRSS/FreshRSS.git
cd ./FreshRSS/
git pull
-sudo docker pull alpine:3.7
+sudo docker pull alpine:3.8
sudo docker build --tag freshrss/freshrss -f Docker/Dockerfile .
```