dinislage/CouchPotatoServer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'refs/heads/develop' into desktop

Browse Source 
Conflicts:
	couchpotato/core/_base/updater/main.py
This commit is contained in:
Ruud
2012-08-05 16:18:35 +02:00
parent 59590b3ac9 cfe1e47df2
commit cc408b980c
31 changed files with 242 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files
version.py
+1
View File
@@ -1 +1,2 @@
VERSION = '2.0.0.pre1'
BRANCH = 'desktop'