Merge pull request #7044 from MrPetovan/task/router

author Philipp <admin+Github@philipp.info>

Thu, 2 May 2019 16:26:30 +0000 (18:26 +0200)

committer GitHub <noreply@github.com>

Thu, 2 May 2019 16:26:30 +0000 (18:26 +0200)
author Philipp <admin+Github@philipp.info>
Thu, 2 May 2019 16:26:30 +0000 (18:26 +0200)
committer GitHub <noreply@github.com>
Thu, 2 May 2019 16:26:30 +0000 (18:26 +0200)
diff --cc mod/photos.php
Simple merge
diff --cc mod/videos.php
Simple merge
diff --cc src/App.php
Simple merge
diff --cc src/Model/Profile.php
Simple merge
author	Philipp <admin+Github@philipp.info>
	Thu, 2 May 2019 16:26:30 +0000 (18:26 +0200)
committer	GitHub <noreply@github.com>
	Thu, 2 May 2019 16:26:30 +0000 (18:26 +0200)
		1	2
mod/photos.php	patch \|	diff1 \|	diff2 \|	blob \| history
mod/videos.php	patch \|	diff1 \|	diff2 \|	blob \| history
src/App.php	patch \|	diff1 \|	diff2 \|	blob \| history
src/Model/Profile.php	patch \|	diff1 \|	diff2 \|	blob \| history