Merge remote-tracking branch 'upstream/dev' into website-import

2016-07-31 07:38:44 -04:00
parent 1e3a645abe da9b6690e5
commit 42b718b3e0
3 changed files with 3 additions and 3 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. 
 	 *
 	 */