Merge master into develop (resolve conflicts for #209)

insightmind / MORR

MORR: (Medical Online Research Recorder)

MIT License

2 stars 1 forks source link

Merge master into develop (resolve conflicts for #209) #214

Closed Gordin508 closed 4 years ago

Gordin508 commented 4 years ago

The merge conflicts were fixed via command-line (by using the version(s) from develop), that's why there is an additional branch instead of a direct merge from master into develop.