WolfAdmin: develop/1.2.0 cfd494a5

Author Committer Branch Timestamp Parent
Timo Timo develop/1.2.0 2017-03-17 16:32 develop/1.2.0 a767d7d8
Changeset Merge branch 'develop/1.1.1' into develop/1.2.0

# Conflicts:
# luamods/wolfadmin/db/db.lua
# luamods/wolfadmin/main.lua
# luamods/wolfadmin/util/files.lua
# luamods/wolfadmin/util/tables.lua
# luascripts/admin/admin.lua
# luascripts/commands/admin/listlevels.lua
# luascripts/commands/admin/showwarns.lua
# luascripts/db/mysql.lua
# luascripts/db/sqlite3.lua
mod - luamods/wolfadmin/db/db.lua Diff File
mod - luamods/wolfadmin/util/files.lua Diff File
add - luascripts/commands/admin/listlevels.lua Diff File