Merge develop branch into master

JohnDoee / autotorrent

Matches torrents with files and gets them seeded

MIT License

269 stars 34 forks source link

Merge develop branch into master #29

Closed ordinarygulp closed 5 years ago

ordinarygulp commented 5 years ago

Master branch is becoming rather outdated. Recommend updating it.

JohnDoee commented 5 years ago

Years ago I wanted to run a git repository a bit better, so I decided to try out git flow. The value it gives me is very low but now I'm stuck with the develop/master branch setup. I think it might be better to just ditch git flow.

When I create a new release, develop is merged into master.