Merge remote-tracking branch 'origin/master'

# Conflicts: # core/src/main/java/it/cavallium/warppi/gui/CalculatorHUD.java
Fixed preview url
2019-12-16 16:59:05 +01:00 · 2019-12-16 16:54:10 +01:00
4 changed files with 13 additions and 13 deletions
--- a/README.md
+++ b/README.md
@ -9,7 +9,7 @@ Step-by-step algebra calculator for Raspberry PI.
 # Live preview
 This preview has been built using TeaVM: a JVM made in javascript.
 Obviously it runs slower than the original.
-https://local.cavallium.it/webtests/warppiweb/
+https://local.cavallium.it/calculator/

 # Keypad PCB
 https://workspace.circuitmaker.com/Projects/Details/Andrea-Cavalli/Scientific-calculator-Keypad
Author	SHA1	Message	Date
Andrea Cavalli	12329c5ffe	Merge remote-tracking branch 'origin/master' # Conflicts: # core/src/main/java/it/cavallium/warppi/gui/CalculatorHUD.java	2019-12-16 16:59:05 +01:00
Andrea Cavalli	0335dadcea	Fixed preview url	2019-12-16 16:54:10 +01:00