Merge branch '1.12RC'

2016-08-22 20:05:25 -07:00
parent fbb357ac47 1a506ad49c
commit b89c869e7c
121 changed files with 29761 additions and 27620 deletions
--- a/include/api.php
+++ b/include/api.php
@@ -13,7 +13,7 @@ require_once('include/api_auth.php');

 	/*
 	 *
-	 * Red API. Loosely based on and possibly compatible with a Twitter-Like API but all similarities end there. 
+	 * Hubzilla API. Loosely based on and possibly compatible with Twitter-Like (v1.0) API but all similarities end there. 
 	 *
 	 */