Merge branch 'master' of https://github.com/Bulletdev/prostaff-api

Author: Bulletdev

Gemfile.lock

@@ -252,7 +252,7 @@ GEM
     multipart-post (2.4.1)
     net-http (0.9.1)
       uri (>= 0.11.1)
-    net-imap (0.6.3)
+    net-imap (0.6.4)
       date
       net-protocol
     net-pop (0.1.2)