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
2013-03-17 16:42:53 +01:00
parent 9e260a89af 1cd8040692
commit 312562a9f5
101 changed files with 4375 additions and 2377 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.6.1'
VERSION = '2.0.7'
BRANCH = 'desktop'