Merge pull request #2131 from rabuzarus/3011_hcard_vcard

author Michael Vogel <icarus@dabo.de>

Thu, 3 Dec 2015 13:16:52 +0000 (14:16 +0100)

committer Michael Vogel <icarus@dabo.de>

Thu, 3 Dec 2015 13:16:52 +0000 (14:16 +0100)
author Michael Vogel <icarus@dabo.de>
Thu, 3 Dec 2015 13:16:52 +0000 (14:16 +0100)
committer Michael Vogel <icarus@dabo.de>
Thu, 3 Dec 2015 13:16:52 +0000 (14:16 +0100)
diff --cc mod/videos.php
Simple merge
diff --cc view/theme/smoothly/style.css
Simple merge
diff --cc view/theme/vier/style.css
Simple merge
author	Michael Vogel <icarus@dabo.de>
	Thu, 3 Dec 2015 13:16:52 +0000 (14:16 +0100)
committer	Michael Vogel <icarus@dabo.de>
	Thu, 3 Dec 2015 13:16:52 +0000 (14:16 +0100)
		1	2
mod/videos.php	patch \|	diff1 \|	diff2 \|	blob \| history
view/theme/smoothly/style.css	patch \|	diff1 \|	diff2 \|	blob \| history
view/theme/vier/style.css	patch \|	diff1 \|	diff2 \|	blob \| history