aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Alexandre Alapetite <alexandre@alapetite.fr> 2015-08-29 12:46:08 +0200
committerGravatar Alexandre Alapetite <alexandre@alapetite.fr> 2015-08-29 12:46:08 +0200
commit25dc1ba45a91ace3596f3cf323973727b5fe2685 (patch)
tree12e9916f4d69d1242a60073a9df2312130ccc378
parente3773caf2df4c6c820f8a24cb10a5a31c769ebf8 (diff)
parent855fe6bc036eaaab5dd924480b68d4792d93a67a (diff)
Merge branch 'FreshRSS/dev' into dev
-rw-r--r--CHANGELOG.md2
1 files changed, 1 insertions, 1 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index da5428e8f..b28f93f41 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,7 +7,7 @@
* 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
+* Bug fixing
* Session cookie bug [#924](https://github.com/FreshRSS/FreshRSS/issues/924)