Commit Graph

14 Commits

Author SHA1 Message Date
Ruud fab8e66fe1 One up
Conflicts:
	version.py
2013-03-17 16:40:22 +01:00
Ruud d27d0abeb0 Merge branch 'refs/heads/develop'
Conflicts:
	version.py
2013-01-24 23:35:37 +01:00
Ruud 44b78f8d2f Version up 2013-01-23 22:56:23 +01:00
Ruud 3ecc826629 Merge branch 'refs/heads/develop'
Conflicts:
	version.py
2012-11-11 22:06:48 +01:00
Ruud 49e2607f5d One up 2012-10-29 21:04:38 +01:00
Ruud b66af0b6c6 One up 2012-10-27 11:52:59 +02:00
Ruud c0fb28301d Merge branch 'refs/heads/develop'
Conflicts:
	version.py
2012-09-16 10:46:39 +02:00
Ruud 43e1adbff9 One up 2012-09-16 10:43:43 +02:00
Ruud 90a09e573b Merge branch 'refs/heads/develop'
Conflicts:
	couchpotato/core/_base/updater/main.py
2012-08-05 16:15:53 +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