Commit 599626d7 authored by Simon MacDonald's avatar Simon MacDonald
Browse files

Merge branch 'proper-swizzling-ios' of... 

Merge branch 'proper-swizzling-ios' of https://github.com/jnuine/phonegap-plugin-push into jnuine-proper-swizzling-ios

Conflicts:
	src/ios/AppDelegate+notification.m
parents 00e9e71a bccfaae3
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment