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

Merge branch 'refs/heads/develop'

Browse Source 
Conflicts:
	couchpotato/core/_base/updater/main.py
This commit is contained in:
Ruud
2012-08-05 16:15:53 +02:00
parent e1d7440b9d cfe1e47df2
commit 90a09e573b
29 changed files with 237 additions and 96 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 = 'master'