aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Alexandre Alapetite <alexandre@alapetite.fr> 2016-03-06 18:08:51 +0100
committerGravatar Alexandre Alapetite <alexandre@alapetite.fr> 2016-03-06 18:08:51 +0100
commit5da50a3c8f34f8d3bb02f05e8df82ce62bd139f9 (patch)
tree6d5cccaed1169195a21a6e60f9060f795c5ff368
parent5453d943ed3540841e76f48a09cc151985b7f39e (diff)
parentc424c8acef45cc32187526d94e4d0bb06092de69 (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 ae6c91946..6be1a4b6a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -14,7 +14,7 @@
* Turkish [#1073](https://github.com/FreshRSS/FreshRSS/issues/1073)
* Bug fixing
* Fixed OPML import title bug [#1048](https://github.com/FreshRSS/FreshRSS/issues/1048)
- * Fixed upgrade bug with SQLite when articles where marked as unread [#1049](https://github.com/FreshRSS/FreshRSS/issues/1049)
+ * Fixed upgrade bug with SQLite when articles were marked as unread [#1049](https://github.com/FreshRSS/FreshRSS/issues/1049)
* Fixed error when deleting feeds from statistics page [#1047](https://github.com/FreshRSS/FreshRSS/issues/1047)
* Fixed several small bugs in global and reader view [#1050](https://github.com/FreshRSS/FreshRSS/pull/1050)
* Fixed sharing bug with PHP7 [#1072](https://github.com/FreshRSS/FreshRSS/issues/1072)