diff options
| -rw-r--r-- | README | 4 | ||||
| -rw-r--r-- | classes/statusnet.ini | 21 | ||||
| -rw-r--r-- | lib/common.php | 2 |
3 files changed, 22 insertions, 5 deletions
@@ -697,13 +697,9 @@ to users on a remote site. (Or not... it's not well tested.) The If fancy URLs is enabled, access to file attachments can also be restricted to logged-in users only. Uncomment the appropriate rewrite -<<<<<<< HEAD:README rule in .htaccess or your server's httpd.conf. (This most likely will not work if you are using a virtual server for attachments, so consider the performance/security tradeoff.) -======= -rule in .htaccess or your server's httpd.conf. ->>>>>>> 446de62... Revert "Added some explanatory text to README":README Upgrading ========= diff --git a/classes/statusnet.ini b/classes/statusnet.ini index ff4ef2c14..2cc37dbfe 100644 --- a/classes/statusnet.ini +++ b/classes/statusnet.ini @@ -544,3 +544,24 @@ modified = 384 [user_group__keys] id = N + +[user_openid] +canonical = 130 +display = 130 +user_id = 129 +created = 142 +modified = 384 + +[user_openid__keys] +canonical = K +display = U + +[user_openid_trustroot] +trustroot = 130 +user_id = 129 +created = 142 +modified = 384 + +[user_openid__keys] +trustroot = K +user_id = K
\ No newline at end of file diff --git a/lib/common.php b/lib/common.php index 732c22bfd..9b3ded037 100644 --- a/lib/common.php +++ b/lib/common.php @@ -22,7 +22,7 @@ if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } //exit with 200 response, if this is checking fancy from the installer if (isset($_REQUEST['p']) && $_REQUEST['p'] == 'check-fancy') { exit; } -define('STATUSNET_VERSION', '0.9.0dev'); +define('STATUSNET_VERSION', '0.9.0rc1'); define('LACONICA_VERSION', STATUSNET_VERSION); // compatibility define('STATUSNET_CODENAME', 'Stand'); |