]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
projects / quix0rs-gnu-social.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: fc3b538 be4b482)
Merge branch 'testing' of gitorious.org:statusnet/mainline into testing
authorZach Copley <zach@status.net>
Thu, 4 Mar 2010 19:19:02 +0000 (11:19 -0800)
committerZach Copley <zach@status.net>
Thu, 4 Mar 2010 19:19:02 +0000 (11:19 -0800)
* '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.)

1  2 
README patch | diff1 | diff2 | blob | history

diff --cc README
Simple merge
This is my personal clone from the wonderful software GNUSocial. I may fix or break things here, so use it on your own risk. :-)