Merge branch 'master' into dev-1.4

Conflicts: net/xenapi/XenAPI/api.php
Contex · Dec 23, 2014 · 13e7940 · 13e7940
2 parents 27186b6 + 2b6fa50
commit 13e7940
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/README.md b/README.md
@@ -1,4 +1,5 @@
-XenAPI
+![Logo](http://i.imgur.com/1qYuVcr.png)
+
 ==========
 
 This REST API allows usage of several of XenForo functions, such as authentication, user information and many more functions!
@@ -7,4 +8,4 @@ This project is a WIP, so be patient. Feel free to submit Pull Requests and sugg
 
 Copyright (c) 2012-2014, XenAPI <http://www.xenapi.net>
 
-XenAPI is licensed under GNU LESSER GENERAL PUBLIC LICENSE Version 3.
+XenAPI is licensed under GNU LESSER GENERAL PUBLIC LICENSE Version 3.
diff --git a/net/xenapi/XenAPI/api.php b/net/xenapi/XenAPI/api.php
@@ -5755,4 +5755,4 @@ public function getUnreadAlertsCount() {
     public function getPermissionCache() {
         return $this->data['global_permission_cache'];
     }
-}
+}