Merge branch 'FreshRSS/dev' into dev

CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## 2016-XX-YY FreshRSS 1.3.2-beta
+
+Nothing for the moment
+
+
 ## 2016-03-11 FreshRSS 1.3.1-beta
 
 * Security

constants.php

@@ -1,5 +1,5 @@
 <?php
-define('FRESHRSS_VERSION', '1.3.1-beta');
+define('FRESHRSS_VERSION', '1.3.2-dev');
 define('FRESHRSS_WEBSITE', 'http://freshrss.org');
 define('FRESHRSS_WIKI', 'http://doc.freshrss.org');