Merge pull request #2221 from rabuzarus/2812_vier_mobile_icons

author fabrixxm <fabrix.xm@gmail.com>

Thu, 31 Dec 2015 08:38:27 +0000 (09:38 +0100)

committer fabrixxm <fabrix.xm@gmail.com>

Thu, 31 Dec 2015 08:38:27 +0000 (09:38 +0100)
author fabrixxm <fabrix.xm@gmail.com>
Thu, 31 Dec 2015 08:38:27 +0000 (09:38 +0100)
committer fabrixxm <fabrix.xm@gmail.com>
Thu, 31 Dec 2015 08:38:27 +0000 (09:38 +0100)
diff --cc view/theme/vier/style.css
Simple merge
diff --cc view/theme/vier/templates/nav.tpl
Simple merge
author	fabrixxm <fabrix.xm@gmail.com>
	Thu, 31 Dec 2015 08:38:27 +0000 (09:38 +0100)
committer	fabrixxm <fabrix.xm@gmail.com>
	Thu, 31 Dec 2015 08:38:27 +0000 (09:38 +0100)
		1	2
view/theme/vier/style.css	patch \|	diff1 \|	diff2 \|	blob \| history
view/theme/vier/templates/nav.tpl	patch \|	diff1 \|	diff2 \|	blob \| history