talhusain / SlothTorrent

8 stars 3 forks source link

Implemented login controller, controllers in torrent.py, and added ve… #86

Closed samliska closed 7 years ago

samliska commented 7 years ago

…rifyUsers() in db.py

badstreff commented 7 years ago

Resolved merge conflicts git fetch upstream; git merge upstream/dev and do a commit+push and I will go ahead and accept this PR.

badstreff commented 7 years ago

Looks good!