diff options
| author | Tobias Diekershoff <tobias.diekershoff@gmx.net> | 2011-10-05 20:59:21 +0200 |
|---|---|---|
| committer | Tobias Diekershoff <tobias.diekershoff@gmx.net> | 2011-10-05 20:59:21 +0200 |
| commit | 90870d4872dbc8ff408183a79fd005b905aa86c2 (patch) | |
| tree | cdd66eea79a7638b520576d381d08368b05a19c1 /boot.php | |
| parent | e88a8564c849b199ca552fa307f385b422d5d00a (diff) | |
| parent | 5cb0b0ed4591a578720e0c985974db2d95f3810a (diff) | |
| download | volse-hubzilla-90870d4872dbc8ff408183a79fd005b905aa86c2.tar.gz volse-hubzilla-90870d4872dbc8ff408183a79fd005b905aa86c2.tar.bz2 volse-hubzilla-90870d4872dbc8ff408183a79fd005b905aa86c2.zip | |
Merge branch 'master' of git://github.com/friendika/Free-Friendika
Diffstat (limited to 'boot.php')
| -rw-r--r-- | boot.php | 6 |
1 files changed, 4 insertions, 2 deletions
@@ -8,9 +8,9 @@ require_once("include/pgettext.php"); require_once('include/nav.php'); define ( 'FRIENDIKA_PLATFORM', 'Free Friendika'); -define ( 'FRIENDIKA_VERSION', '2.3.1118' ); +define ( 'FRIENDIKA_VERSION', '2.3.1124' ); define ( 'DFRN_PROTOCOL_VERSION', '2.21' ); -define ( 'DB_UPDATE_VERSION', 1092 ); +define ( 'DB_UPDATE_VERSION', 1094 ); define ( 'EOL', "<br />\r\n" ); define ( 'ATOM_TIME', 'Y-m-d\TH:i:s\Z' ); @@ -152,6 +152,8 @@ define ( 'ACTIVITY_DISLIKE', NAMESPACE_DFRN . '/dislike' ); define ( 'ACTIVITY_OBJ_HEART', NAMESPACE_DFRN . '/heart' ); define ( 'ACTIVITY_FRIEND', NAMESPACE_ACTIVITY_SCHEMA . 'make-friend' ); +define ( 'ACTIVITY_REQ_FRIEND', NAMESPACE_ACTIVITY_SCHEMA . 'request-friend' ); +define ( 'ACTIVITY_UNFRIEND', NAMESPACE_ACTIVITY_SCHEMA . 'remove-friend' ); define ( 'ACTIVITY_FOLLOW', NAMESPACE_ACTIVITY_SCHEMA . 'follow' ); define ( 'ACTIVITY_UNFOLLOW', NAMESPACE_ACTIVITY_SCHEMA . 'stop-following' ); define ( 'ACTIVITY_POST', NAMESPACE_ACTIVITY_SCHEMA . 'post' ); |