Merge pull request #633 from MrPetovan/task/4889-move-config-to-config

author Michael Vogel <icarus@dabo.de>

Wed, 18 Jul 2018 09:04:38 +0000 (11:04 +0200)

committer GitHub <noreply@github.com>

Wed, 18 Jul 2018 09:04:38 +0000 (11:04 +0200)
author Michael Vogel <icarus@dabo.de>
Wed, 18 Jul 2018 09:04:38 +0000 (11:04 +0200)
committer GitHub <noreply@github.com>
Wed, 18 Jul 2018 09:04:38 +0000 (11:04 +0200)
diff --cc pumpio/pumpio.php
Simple merge
diff --cc twitter/twitter.php
Simple merge
author	Michael Vogel <icarus@dabo.de>
	Wed, 18 Jul 2018 09:04:38 +0000 (11:04 +0200)
committer	GitHub <noreply@github.com>
	Wed, 18 Jul 2018 09:04:38 +0000 (11:04 +0200)
		1	2
pumpio/pumpio.php	patch \|	diff1 \|	diff2 \|	blob \| history
twitter/twitter.php	patch \|	diff1 \|	diff2 \|	blob \| history