View restored after failed merge
modified:   app/main/admin/configuration.lua
Merge pull request #52 from ralzakark/bugfix

View restored after failed merge