Closed universallythinking closed 4 years ago
@universallythinking TYSM, there are merge conflicts with the master branch, could you please resolve them?
(cc @dan-online)
Looks good, as @divy-work said, there are some merge conflicts so it would be great if you could resolve those first
Also can you make cloudinary optional, if someone does not wish to use it or doesn't have it setup, pfp upload errors.
I'm not seeing any conflicts, but I could be missing something... Cloudinary is now optional, with env variables.
Here are the merge conflicts
It doesn't look like I have those permissions...
Give me a sec
Should be good to go...
LGTM, Merging...
I edited ROUTES/API/V1/INDEX.JS and ROUTES/SETTINGS.JS and added CONFIG/CLOUDINARY.JS so that images persist.