 zadam
		
	
	
		93addac8bb
		
	
	
	
	Merge branch 'master' into next61
			zadam
		
	
	
		93addac8bb
		
	
	
	
	Merge branch 'master' into next61
		
			
			# Conflicts:
#	src/becca/entities/bnote.js
#	src/public/app/components/note_context.js
#	src/public/app/layouts/desktop_layout.js
#	src/public/app/services/note_content_renderer.js
#	src/public/app/services/utils.js
#	src/public/app/widgets/ribbon_widgets/file_properties.js
#	src/public/app/widgets/ribbon_widgets/note_info_widget.js
#	src/services/notes.js
		
	
 
		2023-06-05 00:09:55 +02:00
	 
	
	
		 ..
	
	
	
		
			
			
			
			
			
			2022-01-12 21:14:12 +01:00
		 
	
		
			
			
			
			
			
			2022-10-08 20:59:11 +02:00
		 
	
		
			
			
			
			
			
			2022-10-09 21:33:32 +02:00
		 
	
		
			
			
			
			
			
			2022-12-21 16:11:00 +01:00
		 
	
		
			
			
			
			
			
			2022-01-12 19:32:23 +01:00
		 
	
		
			
			
			
			
			
			2022-12-21 16:11:00 +01:00
		 
	
		
			
			
			
			
			
			2022-12-21 16:11:00 +01:00
		 
	
		
			
			
			
			
			
			2022-07-24 21:30:29 +02:00
		 
	
		
			
			
			
			
			
			2022-01-12 19:32:23 +01:00
		 
	
		
			
			
			
			
			
			2023-06-01 17:20:11 +00:00
		 
	
		
			
			
			
			
			
			2023-05-31 17:11:42 +00:00
		 
	
		
			
			
			
			
			
			2022-09-16 13:18:01 +10:00
		 
	
		
			
			
			
			
			
			2022-01-04 23:00:59 +01:00
		 
	
		
			
			
			
			
			
			2022-01-12 21:14:12 +01:00
		 
	
		
			
			
			
			
			
			2022-03-07 22:57:48 +01:00
		 
	
		
			
			
			
			
			
			2022-01-12 19:32:23 +01:00
		 
	
		
			
			
			
			
			
			2022-01-12 19:32:23 +01:00
		 
	
		
			
			
			
			
			
			2022-01-12 19:32:23 +01:00
		 
	
		
			
			
			
			
			
			2022-01-12 19:32:23 +01:00
		 
	
		
			
			
			
			
			
			2023-06-04 23:02:49 +02:00
		 
	
		
			
			
			
			
			
			2022-02-18 22:34:46 +01:00
		 
	
		
			
			
			
			
			
			2023-01-11 23:22:51 +01:00
		 
	
		
			
			
			
			
			
			2022-01-10 17:09:20 +01:00