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

Merge branch 'refs/heads/develop'

Browse Source 
Conflicts:
	version.py
This commit is contained in:
Ruud
2012-11-11 22:06:48 +01:00
parent 32fe3796e4 b03012e4aa
commit 3ecc826629
155 changed files with 1604 additions and 575 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.1'
BRANCH = 'master'