db41fb525fdf13ccb4d52efeb93d709cc1bf6948
				
			
			
		
	https://git.server47.de/jens/ShoppingList.git into development Conflicts: ShoppingList/src/com/jens/rhasspy/shoppinglist/ShoppingListEntry.java ShoppingList/src/com/jens/rhasspy/shoppinglist/Start.java
ShoppingList
See more information and detailed instructions on https://server47.de/rhasspy/shoppingList/
Description
				
					Languages
				
				
								
								
									Java
								
								56.3%
							
						
							
								
								
									PHP
								
								40.1%
							
						
							
								
								
									Shell
								
								3.6%