Merge branch 'master' of https://github.com/tamlyn/angular-http-auth into tamlyn-master

witoldsz · witoldsz · commit 82b011475a6b · 2015-06-12T16:39:54.000+02:00
Conflicts:
	package.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "angular-http-auth",
-  "version": "1.2.1",
+  "version": "1.2.2",
   "description": "HTTP Auth Interceptor Module for AngularJS.",
   "main": "src/http-auth-interceptor.js",
   "repository": {
@@ -12,5 +12,9 @@
   "bugs": {
     "url": "https://github.com/witoldsz/angular-http-auth/issues"
   },
+  "keywords": [
+    "angular",
+    "auth"
+  ],
   "homepage": "https://github.com/witoldsz/angular-http-auth"
-}
+}
