From: Zach Copley Date: Thu, 4 Mar 2010 19:19:02 +0000 (-0800) Subject: Merge branch 'testing' of gitorious.org:statusnet/mainline into testing X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=980d1a66ec0bb5b42ddb39e253fba9bad1b41aca;p=quix0rs-gnu-social.git Merge branch 'testing' of gitorious.org:statusnet/mainline into testing * 'testing' of gitorious.org:statusnet/mainline: Updated note on geo location and added a note on user roles Set up subscription to update@status.net for admin user on new installation, if OStatus is set up and working. (Will fail gracefully on a behind-the-firewall site.) --- 980d1a66ec0bb5b42ddb39e253fba9bad1b41aca