diff options
author | Thomas Willingham <beardyunixer@beardyunixer.com> | 2014-09-02 01:57:30 +0100 |
---|---|---|
committer | Thomas Willingham <beardyunixer@beardyunixer.com> | 2014-09-02 01:57:30 +0100 |
commit | 1c0be3994382ca355db16a2ab9f54dd99a37f1ec (patch) | |
tree | 725c7b2e3ec9f5970fc3b932d7cf3d29e6845717 /boot.php | |
parent | 473e582d1f3e5067c1aecee9c9f2f579864db3ef (diff) | |
parent | d507484cc52840e90fbe88568a56e61a183ef455 (diff) | |
download | volse-hubzilla-1c0be3994382ca355db16a2ab9f54dd99a37f1ec.tar.gz volse-hubzilla-1c0be3994382ca355db16a2ab9f54dd99a37f1ec.tar.bz2 volse-hubzilla-1c0be3994382ca355db16a2ab9f54dd99a37f1ec.zip |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'boot.php')
-rwxr-xr-x | boot.php | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -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); |