db41fb525f
Merge branch 'development' of
...
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
2021-04-29 15:51:45 +02:00
5b81de7484
Units/amount complete.
2021-04-29 15:42:59 +02:00
d75cb0a32f
Amount/Unit progress
2021-04-28 23:19:51 +02:00
26f6e4b7c7
Unit/Amount
2021-04-27 23:28:08 +02:00
6ce0f76483
Amount/Unit progress
2021-04-27 19:59:01 +02:00
1950db40e0
Amount/Unit progress
2021-04-27 16:29:38 +02:00
3d79c8447c
Started amount and unit work.
2021-04-26 02:35:11 +02:00
131ffa55a4
# WARNING: head commit changed in the meantime
...
Change
2021-02-06 02:31:07 +01:00
cc8f3bfa65
Included SQL schema
2021-02-03 22:59:14 +01:00
841eb1f100
Included example settings file.
2021-02-03 22:58:02 +01:00
6b96fcb207
Included compiled jar-version
2021-02-03 22:54:06 +01:00
a1ee3cf1b5
Initial commit
2021-02-03 22:49:24 +01:00
