Merge remote-tracking branch 'origin/develop'

Conflicts: lib/igetui.rb

Merge remote-tracking branch 'origin/develop'
Conflicts: lib/igetui.rb
de216ee7 · Victor Wang · cda9ed65 · d2ad4526 · de216ee7 · de216ee7
Commit de216ee7 authored Dec 22, 2014 by Victor Wang
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

lib/igetui.rb
+1 -1

lib/igetui/version.rb
+1 -1

No files found.
--- a/lib/igetui.rb
+++ b/lib/igetui.rb
@@ -21,7 +21,7 @@ module IGeTui
    def_delegators :pusher, :get_content_id, :cancel_content_id

    def pusher(app_id, api_key, master_secret)
-      IGeTui::Pusher.new(API_URL, app_id, api_key, master_secret)
+      @pusher = IGeTui::Pusher.new(API_URL, app_id, api_key, master_secret)
    end

  end

--- a/lib/igetui/version.rb
+++ b/lib/igetui/version.rb
 module IGeTui
-  VERSION = "1.2.1"
+  VERSION = "1.2.2"
 end