Merge pull request #15617 from mmattel/getenv_system_check_and_warning

author Thomas Müller <thomas.mueller@tmit.eu>

Thu, 23 Apr 2015 12:42:58 +0000 (14:42 +0200)

committer Thomas Müller <thomas.mueller@tmit.eu>

Thu, 23 Apr 2015 12:42:58 +0000 (14:42 +0200)
author Thomas Müller <thomas.mueller@tmit.eu>
Thu, 23 Apr 2015 12:42:58 +0000 (14:42 +0200)
committer Thomas Müller <thomas.mueller@tmit.eu>
Thu, 23 Apr 2015 12:42:58 +0000 (14:42 +0200)
diff --cc settings/admin.php
Simple merge
diff --cc settings/templates/admin.php
Simple merge
author	Thomas Müller <thomas.mueller@tmit.eu>
	Thu, 23 Apr 2015 12:42:58 +0000 (14:42 +0200)
committer	Thomas Müller <thomas.mueller@tmit.eu>
	Thu, 23 Apr 2015 12:42:58 +0000 (14:42 +0200)
		1	2
settings/admin.php	patch \|	diff1 \|	diff2 \|	blob \| history
settings/templates/admin.php	patch \|	diff1 \|	diff2 \|	blob \| history