Private GIT

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

C

CouchPotatoServer
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Releases
- Model registry
- Environments
- Incidents

Snippets Groups Projects

d27d0abe

Commit d27d0abe authored Jan 24, 2013 by Ruud

Downloads
- Plain Diff

Merge branch 'refs/heads/develop'

Conflicts:
	version.py

parents 7c593481 cb92b005

No related branches found

No related tags found

Loading

Changes 4

Show whitespace changes

Inline Side-by-side

Showing

couchpotato/core/downloaders/base.py 3 additions, 0 deletions

couchpotato/core/downloaders/base.py
couchpotato/core/plugins/manage/main.py 1 addition, 1 deletion

couchpotato/core/plugins/manage/main.py
couchpotato/runner.py 1 addition, 1 deletion

couchpotato/runner.py
version.py 1 addition, 1 deletion

version.py

with 6 additions and 3 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment

Another place to be (or not)