search

jfversluis / FilePicker-Plugin-for-Xamarin-and-Windows

FilePicker Plugin for Xamarin and Windows
MIT License
157 stars 80 forks source link

Merge develop into master #117

Closed jfversluis closed 6 years ago

jfversluis commented 6 years ago

As per #116 going to trunk based development

jfversluis commented 6 years ago

Hmm this doesn't look good 🤔

vividos commented 6 years ago

I fear this has to be merged by hand. Can't do it now, sorry!

jfversluis commented 6 years ago

I did it! There were changes in master that weren't in develop... All the more reason to get rid of this way :P

Can you carefully check if it still makes sense?

vividos commented 6 years ago

Hmm develop is correct, but master is 82 commits behind...

vividos commented 6 years ago

And the uwp implementation is missing

jfversluis commented 6 years ago

Alright I give up... When you have time could you have a look maybe? :)

vividos commented 6 years ago

I think the last commit ea8feba was in the wrong direction, it deleted some files. You should reset develop back to the 752f6b6 commit. I'll take a look in the evening.