Commit Graph
6 Commits
Author SHA1 Message Date
Ruud cc408b980c Merge branch 'refs/heads/develop' into desktop
Conflicts:
	couchpotato/core/_base/updater/main.py
2012-08-05 16:18:35 +02:00
Ruud cfe1e47df2 Add branch to version file 2012-08-05 16:14:24 +02:00
Ruud edbeb02efb Proper version check 2012-05-15 23:14:51 +02:00
Ruud fa3324bbd5 Version file 2012-05-14 20:50:54 +02:00
Ruud 478e729e73 Revert "Merge branch 'refs/heads/develop'"
This reverts commit 03a414c601, reversing
changes made to de4e47b4a4.
2012-01-14 11:58:40 +01:00
Ruud f70767be28 py2app fixes 2012-01-14 00:21:10 +01:00