Merge branch 'master' into background

author Camila Ayres <smayres@gmail.com>

Mon, 26 Nov 2018 20:07:14 +0000 (21:07 +0100)

committer GitHub <noreply@github.com>

Mon, 26 Nov 2018 20:07:14 +0000 (21:07 +0100)
author Camila Ayres <smayres@gmail.com>
Mon, 26 Nov 2018 20:07:14 +0000 (21:07 +0100)
committer GitHub <noreply@github.com>
Mon, 26 Nov 2018 20:07:14 +0000 (21:07 +0100)
diff --cc src/gui/application.cpp
Simple merge
diff --cc src/gui/main.cpp
Simple merge
author	Camila Ayres <smayres@gmail.com>
	Mon, 26 Nov 2018 20:07:14 +0000 (21:07 +0100)
committer	GitHub <noreply@github.com>
	Mon, 26 Nov 2018 20:07:14 +0000 (21:07 +0100)
		1	2
src/gui/application.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
src/gui/main.cpp	patch \|	diff1 \|	diff2 \|	blob \| history