aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Alexandre Alapetite <alexandre@alapetite.fr> 2015-08-29 12:03:29 +0200
committerGravatar Alexandre Alapetite <alexandre@alapetite.fr> 2015-08-29 12:03:29 +0200
commite3773caf2df4c6c820f8a24cb10a5a31c769ebf8 (patch)
tree7e0fe3dc9c25702d24a0d33a7c4828bd03f7040e
parent8d31942779a2aed58bb1a3fef3f33c90a490be73 (diff)
parent6066238ca8d2e5304b8df19412e1b248b6904120 (diff)
Merge branch 'FreshRSS/dev' into dev
-rw-r--r--CHANGELOG.md10
1 files changed, 8 insertions, 2 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index c89b52790..da5428e8f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,8 +1,14 @@
# Changelog
-## 2015-08-31 FreshRSS 1.1.3-beta
+## 2015-xx-xx FreshRSS 1.1.3-beta
-Nothing for the moment.
+* UI
+ * Configuration page for global settings such as limits [#958](https://github.com/FreshRSS/FreshRSS/pull/958)
+ * Add feed ID in articles to ease styling [#953](https://github.com/FreshRSS/FreshRSS/issues/953)
+* I18n
+ * Dutch [#949](https://github.com/FreshRSS/FreshRSS/issues/949)
+# Bug fixing
+ * Session cookie bug [#924](https://github.com/FreshRSS/FreshRSS/issues/924)
## 2015-07-30 FreshRSS 1.1.2-beta