Commit de216ee7 by Victor Wang

Merge remote-tracking branch 'origin/develop'

Conflicts:
	lib/igetui.rb
parents cda9ed65 d2ad4526
...@@ -21,7 +21,7 @@ module IGeTui ...@@ -21,7 +21,7 @@ module IGeTui
def_delegators :pusher, :get_content_id, :cancel_content_id def_delegators :pusher, :get_content_id, :cancel_content_id
def pusher(app_id, api_key, master_secret) 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
end end
......
module IGeTui module IGeTui
VERSION = "1.2.1" VERSION = "1.2.2"
end end
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment