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:
	version.py
This commit is contained in:
Ruud
2012-10-27 11:56:57 +02:00
parent aa1fa3eb9a b66af0b6c6
commit 37bf205d7a
274 changed files with 24096 additions and 1792 deletions
Download Patch File Download Diff File Expand all files Collapse all files
version.py
+1 -1
View File
@@ -1,2 +1,2 @@
VERSION = '2.0.0.pre2'
VERSION = '2.0.1'
BRANCH = 'desktop'