Timo Smit cfd494a5e0 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		2017-03-17 15:32:03 +01:00
..
listlevels.lua	Merge branch 'develop/1.1.1' into develop/1.2.0	2017-03-17 15:32:03 +01:00