andyburke/UnityHTTP
1
0
Fork 0
Code Issues 17 Pull requests 1 Projects Releases Packages Wiki Activity Actions

Improvements #41

Open
romansavrulin wants to merge 5 commits from romansavrulin/master into master
pull from: romansavrulin/master
merge into: andyburke:master
Conversation 2 Commits 5 Files changed 3 +27 -14
romansavrulin commented 2015-05-25 08:57:08 -07:00 (Migrated from github.com)
Copy link

Added the ability to set custom SSL certificate verifier, instead of built-in one,

make the librariy compileable in unity5

JSON blow-up fix on subrange UTF8 strings

Added the ability to set custom SSL certificate verifier, instead of built-in one, make the librariy compileable in unity5 JSON blow-up fix on subrange UTF8 strings
andyburke commented 2015-06-15 14:01:24 -07:00 (Migrated from github.com)
Copy link

Sorry I missed this, if you update it to merge cleanly I will merge.

Sorry I missed this, if you update it to merge cleanly I will merge.
andyburke commented 2015-07-08 12:45:37 -07:00 (Migrated from github.com)
Copy link

@romansavrulin still interested in merging if you can make this merge cleanly. Be sure to @ mention me when you do and I'll review and merge so you're not bumped by any later changes.

@romansavrulin still interested in merging if you can make this merge cleanly. Be sure to @ mention me when you do and I'll review and merge so you're not bumped by any later changes.
This pull request has changes conflicting with the target branch.
  • src/Request.cs
View command line instructions

Manual merge helper

Use this merge commit message when completing the merge manually.

Checkout

From your project repository, check out a new branch and test the changes.
git fetch -u origin romansavrulin/master:romansavrulin/master
git switch romansavrulin/master

Merge

Merge the changes and update on Forgejo.

Warning: The "Autodetect manual merge" setting is not enabled for this repository, you will have to mark this pull request as manually merged afterwards.

git switch master
git merge --no-ff romansavrulin/master
git switch romansavrulin/master
git rebase master
git switch master
git merge --ff-only romansavrulin/master
git switch romansavrulin/master
git rebase master
git switch master
git merge --no-ff romansavrulin/master
git switch master
git merge --squash romansavrulin/master
git switch master
git merge --ff-only romansavrulin/master
git switch master
git merge romansavrulin/master
git push origin master
Sign in to join this conversation.
Reviewers
No reviewers
Labels
Clear labels   
bug

   
enhancement

   
high priority

   
low priority
No labels
bug
enhancement
high priority
low priority
Milestone
Clear milestone
No items
No milestone
Projects
Clear projects
No items
No project
Assignees
Clear assignees
No assignees
1 participant
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference
andyburke/UnityHTTP!41
No description provided.