Merge remote-tracking branch 'upstream/develop' into 1702-detect-server
authorMichael <heluecht@pirati.ca>
Mon, 13 Mar 2017 08:53:57 +0000 (08:53 +0000)
committerMichael <heluecht@pirati.ca>
Mon, 13 Mar 2017 08:53:57 +0000 (08:53 +0000)
1  2 
mod/admin.php

diff --cc mod/admin.php
Simple merge