Timo Smit 4ae1421f0b Merge branch 'develop/1.1.0' into develop/1.2.0 ... # Conflicts: # luascripts/commands/admin/listaliases.lua # luascripts/commands/admin/listlevels.lua # luascripts/commands/admin/plock.lua # luascripts/commands/admin/punlock.lua # luascripts/commands/admin/setlevel.lua # luascripts/commands/admin/showhistory.lua # luascripts/commands/admin/stats.lua # luascripts/commands/admin/vmute.lua # luascripts/commands/admin/vunmute.lua # luascripts/commands/admin/warn.lua		2017-01-17 20:20:53 +01:00
..
admin	Fixed undefined player issue at connection	2017-01-16 17:36:57 +01:00
auth	Implemented basic ACL functionality (issue #69)	2017-01-13 18:59:14 +01:00
commands	Merge branch 'develop/1.1.0' into develop/1.2.0	2017-01-17 20:20:53 +01:00
db	Merge branch 'develop/1.1.0' into develop/1.2.0	2017-01-17 20:20:53 +01:00
game	Implemented team locking (issue #62)	2017-01-14 14:30:39 +01:00
players	Load mutes from database and apply to online players (issue #55)	2017-01-14 15:14:43 +01:00
util	Merge branch 'develop/1.1.0' into develop/1.2.0	2017-01-17 20:20:53 +01:00
license.txt	1.0.0	2016-02-13 12:19:37 +01:00
main.lua	Merge branch 'develop/1.1.0' into develop/1.2.0	2017-01-17 20:20:53 +01:00