Merge branch 'MDL-57887-nginx-username-logging' of https://github.com/brendanheywood...
authorDan Poltawski <dan@moodle.com>
Mon, 6 Mar 2017 16:43:38 +0000 (13:43 -0300)
committerDan Poltawski <dan@moodle.com>
Mon, 6 Mar 2017 16:43:38 +0000 (13:43 -0300)
1  2 
config-dist.php

diff --cc config-dist.php
Simple merge