Ozzie Isaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							0e1dbb5377 
							
						 
					 
					
						
						
							
							Copy author names for displaying ( #1935 )  
						
						 
						
						
						
					 
					
						2021-04-13 19:41:44 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzie Isaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							f07cc8b103 
							
						 
					 
					
						
						
							
							Update optional-requirements: flask-dance  
						
						 
						
						... 
						
						
						
						Catch error for invalid oauth tokens
Fixes for displaying error messages on deleting books from list
Fixes for displaying error messages on deleting bookformats
Removed non working sorting in books list 
						
					 
					
						2021-04-13 19:26:10 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzie Isaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							67775bc797 
							
						 
					 
					
						
						
							
							Update requirements  
						
						 
						
						... 
						
						
						
						Catch error for invalid oauth tokens
Fixes for displaying error messages on deleting books from list
Fixes for displaying error messages on deleting bookformats 
						
					 
					
						2021-04-13 19:08:02 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								ElQuimm 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							05933a5f0c 
							
						 
					 
					
						
						
							
							Updated italian message.po  
						
						 
						
						... 
						
						
						
						I have not removed the #, fuzzy lines, but modified the corresponding values. 
						
					 
					
						2021-04-13 18:51:50 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzie Isaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							d32b2ca524 
							
						 
					 
					
						
						
							
							Prevent traceback after delete user  
						
						 
						
						... 
						
						
						
						flash message in case last admin role is removed #1938  
						
					 
					
						2021-04-12 19:04:27 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzie Isaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							d0a895628e 
							
						 
					 
					
						
						
							
							Prevent delete of Guest user  #1938  
						
						 
						
						
						
					 
					
						2021-04-12 18:45:44 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzie Isaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							90f2b3fb21 
							
						 
					 
					
						
						
							
							Refactored list checkbox sort  
						
						 
						
						
						
					 
					
						2021-04-12 18:39:09 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzie Isaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							0f95800dde 
							
						 
					 
					
						
						
							
							Update sqlalchemy-utils dependency for oauth  
						
						 
						
						... 
						
						
						
						Sort for state checkbox in user list and books list working 
						
					 
					
						2021-04-12 18:23:25 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							04971f8672 
							
						 
					 
					
						
						
							
							Bugfix wrong js file in user list  
						
						 
						
						
						
					 
					
						2021-04-11 20:01:40 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							b6177b27f4 
							
						 
					 
					
						
						
							
							Sorting of users in table according to selection possible  
						
						 
						
						
						
					 
					
						2021-04-11 19:59:20 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							ae97e87506 
							
						 
					 
					
						
						
							
							Delete user working from user table ( #1938 )  
						
						 
						
						... 
						
						
						
						Comment in helper 
						
					 
					
						2021-04-10 11:32:25 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzie Isaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							2d73f541c0 
							
						 
					 
					
						
						
							
							Bugfix sort books list and user list  
						
						 
						
						... 
						
						
						
						Prevent transferring password hash to client 
						
					 
					
						2021-04-08 19:37:08 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzie Isaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							7561eabe52 
							
						 
					 
					
						
						
							
							Implement Backend to deny editing Guest rights restriction  #1938  
						
						 
						
						
						
					 
					
						2021-04-07 18:56:17 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzie Isaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							067fb1b0b7 
							
						 
					 
					
						
						
							
							Prevent delete Guest user and redirect to admin page after user delete  
						
						 
						
						
						
					 
					
						2021-04-07 18:47:48 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzie Isaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							78071841cc 
							
						 
					 
					
						
						
							
							After Deleting a book the list page is still displayed  #1938  
						
						 
						
						
						
					 
					
						2021-04-07 18:19:48 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzie Isaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							fac232229e 
							
						 
					 
					
						
						
							
							Added missing ead/unread category in user list  #1938  
						
						 
						
						
						
					 
					
						2021-04-07 17:49:19 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzie Isaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							a43021e87c 
							
						 
					 
					
						
						
							
							Fix for  #1938  
						
						 
						
						
						
					 
					
						2021-04-07 17:46:17 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzie Isaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							1a0de3b3cf 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'de_translation/patch-1' into master  
						
						 
						
						
						
					 
					
						2021-04-06 18:08:32 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzie Isaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							947154dc9c 
							
						 
					 
					
						
						
							
							Merge branch 'development' into master  
						
						 
						
						
						
					 
					
						2021-04-06 18:06:25 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzie Isaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							8acd1f1fe4 
							
						 
					 
					
						
						
							
							Code refactoring and improved error handling for edit user list  
						
						 
						
						... 
						
						
						
						Update teststatus 
						
					 
					
						2021-04-06 17:29:42 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzie Isaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							665210e506 
							
						 
					 
					
						
						
							
							Fixes for book edit with title sort and author sort  
						
						 
						
						
						
					 
					
						2021-04-04 14:01:06 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzie Isaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							91b9370a21 
							
						 
					 
					
						
						
							
							Merge branch 'master' into development  
						
						 
						
						... 
						
						
						
						# Conflicts:
#	cps/static/css/libs/bootstrap-table.min.css
#	cps/static/js/libs/bootstrap-table/bootstrap-table-editable.min.js
#	cps/static/js/libs/bootstrap-table/bootstrap-table.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-af-ZA.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-ar-SA.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-bg-BG.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-ca-ES.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-cs-CZ.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-da-DK.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-de-DE.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-el-GR.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-en-US.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-es-AR.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-es-CL.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-es-CR.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-es-ES.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-es-MX.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-es-NI.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-es-SP.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-et-EE.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-eu-EU.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-fa-IR.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-fi-FI.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-fr-BE.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-fr-CH.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-fr-FR.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-fr-LU.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-he-IL.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-hr-HR.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-hu-HU.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-id-ID.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-it-IT.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-ja-JP.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-ka-GE.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-ko-KR.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-ms-MY.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-nb-NO.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-nl-BE.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-nl-NL.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-pl-PL.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-pt-BR.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-pt-PT.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-ro-RO.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-ru-RU.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-sk-SK.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-sr-Cyrl-RS.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-sr-Latn-RS.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-sv-SE.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-th-TH.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-tr-TR.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-uk-UA.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-ur-PK.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-uz-Latn-UZ.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-vi-VN.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-zh-CN.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-zh-TW.min.js 
						
					 
					
						2021-04-02 17:13:22 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzie Isaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							ca0aa600b4 
							
						 
					 
					
						
						
							
							Bugfix german translation  
						
						 
						
						
						
					 
					
						2021-04-02 17:12:26 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzie Isaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							1c42c4c969 
							
						 
					 
					
						
						
							
							Update bootstrap-table  
						
						 
						
						... 
						
						
						
						Fixes for book edit 
						
					 
					
						2021-04-02 17:11:16 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzie Isaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							6e406311c3 
							
						 
					 
					
						
						
							
							Fix   #1928  (ldap_import_user_filter missing in to_save)  
						
						 
						
						
						
					 
					
						2021-04-02 08:40:29 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								robochud 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							87884c1af2 
							
						 
					 
					
						
						
							
							Update messages.po  
						
						 
						
						... 
						
						
						
						very little typo 
						
					 
					
						2021-03-31 00:56:12 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzie Isaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							c0623a949c 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'caliblur/master' into master  
						
						 
						
						
						
					 
					
						2021-03-29 20:54:04 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								cbartondock 
							
						 
					 
					
						
						
						
						
							
						
						
							42a23ea23c 
							
						 
					 
					
						
						
							
							removed some dumb graphical inconsistencies  
						
						 
						
						
						
					 
					
						2021-03-29 14:35:48 -04:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								cbartondock 
							
						 
					 
					
						
						
						
						
							
						
						
							710c31d1ca 
							
						 
					 
					
						
						
							
							Fixed book details not loading after infinite scroll  
						
						 
						
						
						
					 
					
						2021-03-29 14:13:22 -04:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								cbartondock 
							
						 
					 
					
						
						
						
						
							
						
						
							f637ba4dad 
							
						 
					 
					
						
						
							
							Fixed border display in book details  
						
						 
						
						
						
					 
					
						2021-03-29 13:52:09 -04:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzie Isaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							80d2c60cef 
							
						 
					 
					
						
						
							
							Update testresults  
						
						 
						
						
						
					 
					
						2021-03-29 18:03:09 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzie Isaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							b17d71e4c3 
							
						 
					 
					
						
						
							
							Update optional-requirements.txt  
						
						 
						
						... 
						
						
						
						Bugfix Mail task after convert task 
						
					 
					
						2021-03-28 20:36:08 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzie Isaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							3c5bd3a605 
							
						 
					 
					
						
						
							
							Added gmail.json file to excluded file, added file also to excluded file during update  
						
						 
						
						
						
					 
					
						2021-03-28 15:01:56 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzie Isaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							7cc8d1e693 
							
						 
					 
					
						
						
							
							remove file  
						
						 
						
						
						
					 
					
						2021-03-28 14:58:07 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzie Isaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							99520d54a5 
							
						 
					 
					
						
						
							
							Added ability to send emails via gmail ( #1905 )  
						
						 
						
						... 
						
						
						
						Gmail email sending 
						
					 
					
						2021-03-28 14:51:01 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzie Isaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							e10a8c078b 
							
						 
					 
					
						
						
							
							Merge branch 'master' into development  
						
						 
						
						... 
						
						
						
						# Conflicts:
#	cps/templates/email_edit.html 
						
					 
					
						2021-03-27 18:36:11 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzie Isaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							7a196fed7c 
							
						 
					 
					
						
						
							
							Prevent empty email port and server address( #1906 )  
						
						 
						
						
						
					 
					
						2021-03-27 18:34:57 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzie Isaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							c418c7e725 
							
						 
					 
					
						
						
							
							Prevent empty email from field ( #1906 )  
						
						 
						
						
						
					 
					
						2021-03-27 18:31:49 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzie Isaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							e35748deff 
							
						 
					 
					
						
						
							
							Fix wording and tabs  
						
						 
						
						
						
					 
					
						2021-03-27 17:30:54 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzie Isaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							b57efbe31c 
							
						 
					 
					
						
						
							
							Fix wording and tabs  
						
						 
						
						
						
					 
					
						2021-03-27 17:30:10 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzie Isaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							8f91437701 
							
						 
					 
					
						
						
							
							Implementation for gmail server with OAuth2 started  
						
						 
						
						
						
					 
					
						2021-03-27 16:36:24 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzie Isaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							a7eb547ca4 
							
						 
					 
					
						
						
							
							Renamed brazilian datepicker file  
						
						 
						
						
						
					 
					
						2021-03-27 12:40:23 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzie Isaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							0ceb12f74f 
							
						 
					 
					
						
						
							
							Renamed brazilian datepicker file  
						
						 
						
						
						
					 
					
						2021-03-27 12:40:01 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzie Isaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							4960624de7 
							
						 
					 
					
						
						
							
							Merge branch 'master' into development  
						
						 
						
						
						
					 
					
						2021-03-27 12:20:28 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzie Isaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							2c92f24d89 
							
						 
					 
					
						
						
							
							Added Brazilian translation  
						
						 
						
						
						
					 
					
						2021-03-27 12:20:07 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzie Isaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							0b7c679dba 
							
						 
					 
					
						
						
							
							Changed test email message ( fix   #657 )  
						
						 
						
						
						
					 
					
						2021-03-27 09:48:43 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzie Isaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							aab3cdc58a 
							
						 
					 
					
						
						
							
							Changed test email message  
						
						 
						
						
						
					 
					
						2021-03-27 09:47:43 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzie Isaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							3c63f5b204 
							
						 
					 
					
						
						
							
							Merge branch 'master' into development  
						
						 
						
						
						
					 
					
						2021-03-27 09:46:12 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzie Isaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							0b97bbf827 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'div_a/use-kobo-for-download-link' into master  
						
						 
						
						
						
					 
					
						2021-03-27 09:39:44 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzie Isaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							970dbb0c59 
							
						 
					 
					
						
						
							
							Merge branch 'master' into development  
						
						 
						
						... 
						
						
						
						# Conflicts:
#	cps/opds.py
#	cps/templates/admin.html 
						
					 
					
						2021-03-27 09:38:12 +01:00