mirror/FreshRSS
0
0
Fork 0
mirror of https://github.com/FreshRSS/FreshRSS.git synced 2026-04-03 22:25:04 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'FreshRSS/dev' into dev

Browse Source
This commit is contained in:
Alexandre Alapetite
2016-03-11 22:35:49 +01:00
parent 683232b743 f64d7384a7
commit c34bdec29b
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG.md
View File

@@ -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)

2
constants.php
View File

@@ -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');