etlegacy/wolfadmin
0
0
Fork 0
mirror of https://github.com/etlegacy/wolfadmin.git synced 2024-11-10 14:51:54 +00:00
Code Issues Projects Releases Packages Wiki Activity
wolfadmin/luascripts/commands
History
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 Merge branch 'develop/1.1.0' into develop/1.2.0 2017-01-17 20:20:53 +01:00
client Merge branch 'develop/1.1.0' into develop/1.2.0 2017-01-17 20:20:53 +01:00
server Copyright update 2017-01-04 10:38:25 +01:00
commands.lua Merge branch 'develop/1.1.0' into develop/1.2.0 2017-01-17 20:20:53 +01:00