From: Evan Prodromou <evan@status.net>
Date: Mon, 2 Nov 2009 23:11:45 +0000 (-0500)
Subject: Merge branch '0.8.x' into 0.9.x
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=61419038e5747886357964a7eb3f814761482891;p=quix0rs-gnu-social.git

Merge branch '0.8.x' into 0.9.x

Conflicts:
	README
---

61419038e5747886357964a7eb3f814761482891
diff --cc README
index 952c914fec,a10628ac7f..7ecd025ac5
--- a/README
+++ b/README
@@@ -150,7 -150,8 +150,9 @@@ released Aug 26 2009. Notable changes t
  - Use the NICKNAME_FMT constant for detecting nicknames.
  - Check for site servername config'd.
  - Compatibility fix for empty status updates with Twitter API.
 +- Option to show files privately (EXPERIMENTAL! Use with caution.)
+ - a script to register a new user.
+ - a script to make a user admin of a group.
  
  Prerequisites
  =============