diff options
| author | Paolo T <tuscanhobbit@users.noreply.github.com> | 2014-09-02 13:15:59 +0200 |
|---|---|---|
| committer | Paolo T <tuscanhobbit@users.noreply.github.com> | 2014-09-02 13:15:59 +0200 |
| commit | fee5b6bd1599599da2f3b662f04b9651b23fb4e4 (patch) | |
| tree | e4ab47f657ce1e6ae0aabf6be51bdf169e4b389d /boot.php | |
| parent | a1f85cda3ec0e6fc1c661ee12b1e7d87b3f242c5 (diff) | |
| parent | 9dac46ca25b11f80dded42db31e7e062fc7b5142 (diff) | |
| download | volse-hubzilla-fee5b6bd1599599da2f3b662f04b9651b23fb4e4.tar.gz volse-hubzilla-fee5b6bd1599599da2f3b662f04b9651b23fb4e4.tar.bz2 volse-hubzilla-fee5b6bd1599599da2f3b662f04b9651b23fb4e4.zip | |
Merge pull request #2 from friendica/master
Merge from main project
Diffstat (limited to 'boot.php')
| -rwxr-xr-x | boot.php | 9 |
1 files changed, 2 insertions, 7 deletions
@@ -47,7 +47,7 @@ define ( 'RED_PLATFORM', 'Red Matrix' ); define ( 'RED_VERSION', trim(file_get_contents('version.inc')) . 'R'); define ( 'ZOT_REVISION', 1 ); -define ( 'DB_UPDATE_VERSION', 1123 ); +define ( 'DB_UPDATE_VERSION', 1128 ); define ( 'EOL', '<br />' . "\r\n" ); define ( 'ATOM_TIME', 'Y-m-d\TH:i:s\Z' ); @@ -304,7 +304,7 @@ define ( 'ABOOK_FLAG_ARCHIVED' , 0x0008); define ( 'ABOOK_FLAG_PENDING' , 0x0010); define ( 'ABOOK_FLAG_UNCONNECTED', 0x0020); define ( 'ABOOK_FLAG_SELF' , 0x0080); - +define ( 'ABOOK_FLAG_FEED' , 0x0100); define ( 'MAIL_DELETED', 0x0001); @@ -358,11 +358,6 @@ define ( 'MAX_LIKERS', 10); define ( 'ZCURL_TIMEOUT' , (-1)); -/** - * Hours before chat lines are deleted - */ - -define ( 'MAX_CHATROOM_HOURS' , 36); /** * email notification options |