Merge remote-tracking branch 'upstream/develop' into 1601-api-statuses-lookup

diff --git a/include/api.php b/include/api.php
index d54e540f7966ca697eb72180e17978b7751dd254..e5ca8ca7878d573c7dfefc00361e81ed080d4289 100644 (file)
--- a/include/api.php
+++ b/include/api.php
@@ -319,6 +319,7 @@
                                        }
                                }
                        }
+                       logger('API call not implemented: '.$a->query_string);
                        throw new NotImplementedException();
                } catch (HTTPException $e) {
                        header("HTTP/1.1 {$e->httpcode} {$e->httpdesc}");
@@ -2564,6 +2565,7 @@
                        killme();
                }
        }
+       api_register_func('api/gnusocial/version','api_statusnet_version',false);
        api_register_func('api/statusnet/version','api_statusnet_version',false);
 
        /**