1
0
mirror of https://git.tt-rss.org/git/tt-rss.git synced 2026-02-10 16:01:33 +00:00

fix merge conflict with stylesheet tags

This commit is contained in:
Richard Beales
2013-03-20 16:59:19 +00:00
42 changed files with 1564 additions and 1401 deletions
+2
View File
@@ -128,6 +128,8 @@
define('SESSION_COOKIE_LIFETIME', 86400*30);
// Default lifetime of a session (e.g. login) cookie. In seconds,
// 0 means cookie will be deleted when browser closes.
// Setting this to zero will affect several user preferences
// like widescreen mode not saving.
define('SESSION_EXPIRE_TIME', 86400*30);
// Hard expiration limit for sessions. Should be