Commit Graph

35 Commits

Author SHA1 Message Date
Ruud
0088584a50 Revert "Merge branch 'desktop' of github.com:RuudBurger/CouchPotatoServer"
This reverts commit 40cd1b4e08, reversing
changes made to 5b1dd68675.
2015-02-16 16:23:02 +01:00
Ruud
cd55966575 One up! 2014-11-09 13:50:52 +01:00
Ruud
0567504394 One up! 2014-10-11 22:46:45 +02:00
Ruud
5df14d67e1 One up 2014-07-17 22:28:32 +02:00
Ruud
0622e6e5ab One up 2014-06-29 23:16:09 +02:00
Ruud
c4aaa10308 One up 2014-06-23 20:00:06 +02:00
Ruud
d3efda74b2 One up 2014-03-16 09:44:44 +01:00
Ruud
f79fcda27f Small one up 2013-11-17 21:22:24 +01:00
Ruud
5d913e87c3 One up! 2013-11-17 20:20:18 +01:00
Ruud
8d108b92bf One Up 2013-09-23 21:48:12 +02:00
Ruud
d08c7c57a8 One up! 2013-09-20 17:46:54 +02:00
Ruud
3b7376fd18 One up 2013-07-06 01:01:26 +02:00
Ruud
e2852407ea One up 2013-06-03 22:22:44 +02:00
Ruud
821f68909d One up 2013-05-05 21:19:10 +02:00
Ruud
88579cd71a One up 2013-03-19 20:52:07 +01:00
Ruud
312562a9f5 Merge branch 'refs/heads/develop' into desktop
Conflicts:
	version.py
2013-03-17 16:42:53 +01:00
Ruud
1cd8040692 One up 2013-03-17 16:39:09 +01:00
Ruud
9e260a89af One up 2013-01-26 14:51:39 +01:00
Ruud
6115917660 Merge branch 'refs/heads/develop' into desktop
Conflicts:
	version.py
2013-01-23 22:57:07 +01:00
Ruud
44b78f8d2f Version up 2013-01-23 22:56:23 +01:00
Ruud
51e747049d One up 2013-01-07 23:10:42 +01:00
Ruud
9a314cfbc4 One up 2012-12-29 00:03:45 +01:00
Ruud
96472a9a8f One up 2012-12-16 23:51:58 +01:00
Ruud
c9e732651f One up 2012-12-01 12:16:58 +01:00
Ruud
49e2607f5d One up 2012-10-29 21:04:38 +01:00
Ruud
37bf205d7a Merge branch 'refs/heads/develop' into desktop
Conflicts:
	version.py
2012-10-27 11:56:57 +02:00
Ruud
b66af0b6c6 One up 2012-10-27 11:52:59 +02:00
Ruud
96995bbbe5 Merge branch 'refs/heads/develop' into desktop
Conflicts:
	version.py
2012-09-16 10:45:19 +02:00
Ruud
43e1adbff9 One up 2012-09-16 10:43:43 +02:00
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