diff options
| author |  Alexandre Alapetite <alexandre@alapetite.fr>
| 2016-03-11 22:35:49 +0100 |
|---|---|---|
| committer | Alexandre Alapetite <alexandre@alapetite.fr>
| 2016-03-11 22:35:49 +0100 |
| commit | c34bdec29b70267645ea5e4bce3e3360b64cdfc9 (patch) | |
| tree | bf47fd99928a6782a309cdd1171516029d4f9611 | |
| parent | 683232b743d9b464408a255e13fef8b2e28a3cc8 (diff) | |
| parent | f64d7384a7df16c7fef7418038fc7f891bebb588 (diff) | |
Merge branch 'FreshRSS/dev' into dev
| -rw-r--r-- | CHANGELOG.md | 2 | ||||
| -rw-r--r-- | constants.php | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 233d9bdba..5e80b43ed 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,6 @@ # Changelog -## 2016-03-xx FreshRSS 1.3.1-beta +## 2016-03-11 FreshRSS 1.3.1-beta * Security * Added CSP `Content-Security-Policy: default-src 'self'; child-src *; frame-src *; img-src * data:; media-src *` [#1075](https://github.com/FreshRSS/FreshRSS/issues/1075), [#1114](https://github.com/FreshRSS/FreshRSS/issues/1114) diff --git a/constants.php b/constants.php index a501d0df5..a279534e3 100644 --- a/constants.php +++ b/constants.php @@ -1,5 +1,5 @@ <?php -define('FRESHRSS_VERSION', '1.3.1-dev'); +define('FRESHRSS_VERSION', '1.3.1-beta'); define('FRESHRSS_WEBSITE', 'http://freshrss.org'); define('FRESHRSS_WIKI', 'http://doc.freshrss.org'); |