diff options
| author |  Alexandre Alapetite <alexandre@alapetite.fr>
| 2015-07-10 23:49:00 +0200 |
|---|---|---|
| committer | Alexandre Alapetite <alexandre@alapetite.fr>
| 2015-07-10 23:49:00 +0200 |
| commit | 96ca643a8cb9ad4779b3d82f4c6a0cc8035c903a (patch) | |
| tree | fa166f5866f975ec9353962ab9da1a9ade705af9 | |
| parent | 4c825926cd2b9101a5060b247ef1722ca1f34f14 (diff) | |
| parent | 96b720b03269826ea0a6d58d8aea8ebf7ce7c1d9 (diff) | |
Merge remote-tracking branch 'origin/hex2bin' 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 0ebfd50ac..2f0bb48f3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,7 +12,7 @@ * Increased pagination limit to 500 articles. [#872](https://github.com/FreshRSS/FreshRSS/issues/872) * Improved UI for installation. [#855](https://github.com/FreshRSS/FreshRSS/issues/855) * Misc. - * Restore support for PHP 5.2. [#214a5cc](https://github.com/Alkarex/FreshRSS/commit/214a5cc9a4c2b821961bc21f22b4b08e34b5be68) + * Restore support for PHP 5.2.1+. [#214a5cc](https://github.com/Alkarex/FreshRSS/commit/214a5cc9a4c2b821961bc21f22b4b08e34b5be68) [#894](https://github.com/FreshRSS/FreshRSS/issues/894) * Support for data-src for images of articles retrieved via the full-content module. [#877](https://github.com/FreshRSS/FreshRSS/issues/877) * Add a couple of default feeds for fresh installations. [#886](https://github.com/FreshRSS/FreshRSS/issues/886) * Changed some log visibilities. [#885](https://github.com/FreshRSS/FreshRSS/issues/885) diff --git a/constants.php b/constants.php index d5f0cc06b..2df014053 100644 --- a/constants.php +++ b/constants.php @@ -25,4 +25,4 @@ define('FRESHRSS_PATH', dirname(__FILE__)); define('APP_PATH', FRESHRSS_PATH . '/app'); define('EXTENSIONS_PATH', FRESHRSS_PATH . '/extensions'); -define('TMP_PATH', sys_get_temp_dir()); +define('TMP_PATH', sys_get_temp_dir()); //Requires PHP 5.2.1+ |