Merge branch 'master' into better_inventory

 Conflicts:
	README
	data/templates/products/entry.html
	docker/Dockerfile
	docker/init.sh
	src/database/database.vala
	src/database/db-interface.vala
	src/pdf-stock/Makefile
	src/pdf-stock/pdf-stock-interface.vala
	src/pdf-stock/pdf-stock.vala
	src/web/Makefile
	src/web/main.vala
	templates/menu.html
	templates/products/index.html

1 files changed, 3 insertions, 3 deletions

diff --git a/src/curses-ui/message_box_overlay.vala b/src/curses-ui/message_box_overlay.vala
index 721ab06..7b5a09b 100644
--- a/src/curses-ui/message_box_overlay.vala
+++ b/src/curses-ui/message_box_overlay.vala
@@ -37,13 +37,13 @@ public class MessageBoxOverlay {
 		Timeout.add_seconds(1, decrementTitleCountdown);
 	}
 
-	private void setTitle() {	
+	private void setTitle() {
 		var title = "    === %s (%d) ===    ".printf(dialogTitle, countdownValue);
 		int title_x = (COLS - title.length)/2;
-		win.mvaddstr(0, title_x, title);		
+		win.mvaddstr(0, title_x, title);
 	}
 
-	private bool decrementTitleCountdown() {	
+	private bool decrementTitleCountdown() {
 		countdownValue--;
 		setTitle();
 		win.refresh();