Merge branch '3.0.x'

Merge branch '3.0.x' into master
2026-01-04 13:41:00 -05:00 · 2020-08-30 20:58:31 +02:00 · 2020-08-18 11:05:50 +02:00 · 2020-08-02 09:46:41 +02:00 · 2019-05-24 11:39:14 +02:00 · 2019-05-24 09:33:12 +02:00
2 changed files with 3 additions and 3 deletions
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,7 +1,7 @@
 sabyenc3>=4.0.0
 cheetah3>=3.0.0
 cryptography
-feedparser<6.0.0
+feedparser
 configobj
 cheroot<8.4.3
 cherrypy
--- a/sabnzbd/version.py
+++ b/sabnzbd/version.py
@@ -4,5 +4,5 @@

 # You MUST use double quotes (so " and not ')

-__version__ = "3.0.1"
-__baseline__ = "9a4be70734dbf7ac60f5d4d308a8ff1223206503"
+__version__ = "3.0.2"
+__baseline__ = "51cc7659493b8f98b5da7537831d1a56f2777775"
Author	SHA1	Message	Date
Safihre	971e4fc909	Merge branch '3.0.x'	2020-08-30 20:58:31 +02:00
Safihre	41ca217931	Merge branch '3.0.x'	2020-08-18 11:05:50 +02:00
Safihre	0087940898	Merge branch '3.0.x' into master	2020-08-02 09:46:41 +02:00
Safihre	8f21533e76	Set version to 2.3.9	2019-05-24 11:39:14 +02:00
Safihre	89996482a1	Merge branch '2.3.x'	2019-05-24 09:33:12 +02:00
Safihre	03c10dce91	Update text files for 2.3.9	2019-05-24 09:32:34 +02:00
Safihre	bd5331be05	Merge branch 'develop' into 2.3.x	2019-05-24 09:12:02 +02:00
Safihre	46e1645289	Correct typo in release notes	2019-05-18 10:56:39 +02:00
Safihre	4ce3965747	Update text files for 2.3.9RC2	2019-05-18 09:56:05 +02:00
Safihre	9d4af19db3	Merge branch 'develop' into 2.3.x	2019-05-18 09:45:20 +02:00
Safihre	48e034f4be	Update text files for 2.3.9RC1	2019-05-07 13:50:20 +02:00
Safihre	f8959baa2f	Revert "Notify develop-users that we will switch to Python 3" This reverts commit `fb238af7de`.	2019-05-07 13:35:13 +02:00
Safihre	8ed5997eae	Merge branch 'develop' into 2.3.x	2019-05-07 13:10:10 +02:00
Safihre	daf9f50ac8	Set version to 2.3.8	2019-03-18 11:10:56 +01:00
Safihre	6b11013c1a	Merge branch '2.3.x'	2019-03-18 11:09:35 +01:00