Skip to content

Commit

Permalink
Merge branch 'feature/aided' into 'develop'
Browse files Browse the repository at this point in the history
Feature/aided

See merge request PBSA/PeerplaysIO/bos/CouchPotato/python-cp-gui!11
  • Loading branch information
jemshid committed Apr 14, 2021
2 parents e5d23ac + cce8880 commit 6020e0d
Show file tree
Hide file tree
Showing 17 changed files with 3,170 additions and 63 deletions.
1 change: 0 additions & 1 deletion couchpotato/cp_local.py

This file was deleted.

Loading

0 comments on commit 6020e0d

Please sign in to comment.