Merge branch 'master' of github.com:Fab1en/rocket-chat-rest-client

Conflicts: README.md composer.json
Fab1en · Apr 4, 2017 · 0599b45 · 0599b45
2 parents 139eed4 + e530ecf
commit 0599b45
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 3 deletions.
diff --git a/.gitignore b/.gitignore
diff --git a/README.md b/README.md
@@ -30,7 +30,7 @@ define('REST_API_ROOT', '/api/v1/');
 define('ROCKET_CHAT_INSTANCE', 'https://my-rocket-chat-instance.example.org');
 ```
 
-Finaly, instance the classes you need :
+Finally, instance the classes you need:
 ```php
 $api = new \RocketChat\Client();
 echo $api->version(); echo "\n";

diff --git a/composer.json b/composer.json
@@ -8,4 +8,4 @@
     "require": {
         "nategood/httpful": "*"
     }
-}
+}
-Original file line number
+Diff line change
@@ Expand Up / @@ -8,4 +8,4 @@ @@
         "require": {
             "nategood/httpful": "*"
         }
-    }
+    }