 Ozzie Isaacs
		
	
	508e2b4d0a
	
	
	Merge branch 'master' into Develop
			Ozzie Isaacs
		
	
	508e2b4d0a
	
	
	Merge branch 'master' into Develop
		
			
			# Conflicts:
#	cps/admin.py
#	cps/config_sql.py
#	cps/search.py
#	cps/templates/admin.html
#	cps/web.py
#	setup.cfg
#	test/Calibre-Web TestSummary_Linux.html
		
	
 
		2023-01-28 18:52:50 +01:00
	 
	
	
	
		 ..
	
	
	
		
			
			
			
			
			
			2023-01-21 15:44:10 +01:00
		 
	
		
			
			
			
			
			
			2020-12-27 19:12:27 +01:00
		 
	
		
			
			
			
			
			
			2021-10-16 11:48:00 +02:00
		 
	
		
			
			
			
			
			
			2021-10-03 09:31:24 +02:00
		 
	
		
			
			
			
			
			
			2022-06-16 11:15:17 +02:00
		 
	
		
			
			
			
			
			
			2023-01-21 15:44:10 +01:00
		 
	
		
			
			
			
			
			
			2022-10-11 19:50:23 +09:00
		 
	
		
			
			
			
			
			
			2017-08-15 22:11:01 -07:00
		 
	
		
			
			
			
			
			
			2020-12-27 19:12:27 +01:00
		 
	
		
			
			
			
			
			
			2021-10-21 20:13:04 +02:00
		 
	
		
			
			
			
			
			
			2019-08-16 11:18:39 -04:00
		 
	
		
			
			
			
			
			
			2021-05-14 09:29:24 +02:00
		 
	
		
			
			
			
			
			
			2021-10-25 19:17:10 +02:00
		 
	
		
			
			
			
			
			
			2021-05-14 09:29:24 +02:00
		 
	
		
			
			
			
			
			
			2020-11-09 15:47:27 +01:00
		 
	
		
			
			
			
			
			
			2021-10-25 19:17:10 +02:00
		 
	
		
			
			
			
			
			
			2021-05-14 09:29:24 +02:00
		 
	
		
			
			
			
			
			
			2022-12-22 23:38:28 +01:00
		 
	
		
			
			
			
			
			
			2022-12-22 23:38:28 +01:00
		 
	
		
			
			
			
			
			
			2019-01-03 22:01:52 +01:00
		 
	
		
			
			
			
			
			
			2017-05-13 14:01:52 +02:00
		 
	
		
			
			
			
			
			
			2022-09-05 19:42:02 +02:00
		 
	
		
			
			
			
			
			
			2022-09-05 19:42:02 +02:00
		 
	
		
			
			
			
			
			
			2021-10-25 19:17:10 +02:00
		 
	
		
			
			
			
			
			
			2019-03-28 07:23:45 +02:00
		 
	
		
			
			
			
			
			
			2018-12-27 10:53:19 +01:00
		 
	
		
			
			
			
			
			
			2021-05-14 09:29:24 +02:00
		 
	
		
			
			
			
			
			
			2022-12-27 00:18:56 +01:00
		 
	
		
			
			
			
			
			
			2019-07-13 20:54:21 +02:00
		 
	
		
			
			
			
			
			
			2021-10-11 19:56:54 +02:00
		 
	
		
			
			
			
			
			
			2021-05-14 09:29:24 +02:00
		 
	
		
			
			
			
			
			
			2022-09-05 19:42:02 +02:00
		 
	
		
			
			
			
			
			
			2021-10-21 20:13:04 +02:00
		 
	
		
			
			
			
			
			
			2021-10-21 20:13:04 +02:00