diff options
| author | Fabio Comuni <fabrix.xm@gmail.com> | 2011-10-03 08:13:40 +0200 |
|---|---|---|
| committer | Fabio Comuni <fabrix.xm@gmail.com> | 2011-10-03 08:13:40 +0200 |
| commit | 2465b3274aacaf81c50d2bd11375f02cb9b49d54 (patch) | |
| tree | 48b0e70acffedfa4c9226a6b436c5b62556b3470 /boot.php | |
| parent | 60e0f79b9f9e94b19cc412eac41e5d8f8fec2383 (diff) | |
| parent | 297ab898b7642cf8251405cb60e787222f4e5974 (diff) | |
| download | volse-hubzilla-2465b3274aacaf81c50d2bd11375f02cb9b49d54.tar.gz volse-hubzilla-2465b3274aacaf81c50d2bd11375f02cb9b49d54.tar.bz2 volse-hubzilla-2465b3274aacaf81c50d2bd11375f02cb9b49d54.zip | |
Merge remote-tracking branch 'friendika/master'
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.1119' ); +define ( 'FRIENDIKA_VERSION', '2.3.1122' ); define ( 'DFRN_PROTOCOL_VERSION', '2.21' ); -define ( 'DB_UPDATE_VERSION', 1093 ); +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' ); |