Merge branch 'master' of D:\open_server\OpenServer\domains\nu with conflicts.
Merge remote-tracking branch 'origin/master'
photo