Permalink
Browse files

Merge branch 'master' of https://github.com/AFNetworking/AFOAuth1Client

Conflicts:
	AFOAuth1Client/AFOAuth1Client.m
  • Loading branch information...
2 parents 385fcca + af581b8 commit 2990c007c554b37d47c302544a31a9f83917e9a5 @mattt mattt committed Mar 5, 2013
Showing with 1 addition and 1 deletion.
  1. +1 −1 AFOAuth1Client/AFOAuth1Client.m
View
2 AFOAuth1Client/AFOAuth1Client.m
@@ -62,7 +62,7 @@
}
static NSString * AFPercentEscapedQueryStringPairMemberFromStringWithEncoding(NSString *string, NSStringEncoding encoding) {
- static NSString * const kAFCharactersToBeEscaped = @":/?&=;+!@#$()~";
+ static NSString * const kAFCharactersToBeEscaped = @":/?&=;+!@#$()~',";
static NSString * const kAFCharactersToLeaveUnescaped = @"[].";
return (__bridge_transfer NSString *)CFURLCreateStringByAddingPercentEscapes(kCFAllocatorDefault, (__bridge CFStringRef)string, (__bridge CFStringRef)kAFCharactersToLeaveUnescaped, (__bridge CFStringRef)kAFCharactersToBeEscaped, CFStringConvertNSStringEncodingToEncoding(encoding));

0 comments on commit 2990c00

Please sign in to comment.