Merge pull request #292 from Stunkymonkey/format_quality

author Ingo Bürk <admin@airblader.de>

Fri, 29 Jun 2018 21:10:53 +0000 (23:10 +0200)

committer GitHub <noreply@github.com>

Fri, 29 Jun 2018 21:10:53 +0000 (23:10 +0200)
author Ingo Bürk <admin@airblader.de>
Fri, 29 Jun 2018 21:10:53 +0000 (23:10 +0200)
committer GitHub <noreply@github.com>
Fri, 29 Jun 2018 21:10:53 +0000 (23:10 +0200)
diff --cc i3status.c
Simple merge
diff --cc man/i3status.man
Simple merge
author	Ingo Bürk <admin@airblader.de>
	Fri, 29 Jun 2018 21:10:53 +0000 (23:10 +0200)
committer	GitHub <noreply@github.com>
	Fri, 29 Jun 2018 21:10:53 +0000 (23:10 +0200)
		1	2
i3status.c	patch \|	diff1 \|	diff2 \|	blob \| history
man/i3status.man	patch \|	diff1 \|	diff2 \|	blob \| history