WolfAdmin: develop/1.2.0 4ae1421f
| Author | Committer | Branch | Timestamp | Parent |
|---|---|---|---|---|
| Timo | Timo | develop/1.2.0 | 2017-01-17 21:20 | develop/1.2.0 dcb28593 |
| Changeset | 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 |
|||
| mod - luascripts/commands/admin/listaliases.lua | Diff File | |||
| mod - luascripts/commands/admin/listlevels.lua | Diff File | |||
| mod - luascripts/commands/admin/plock.lua | Diff File | |||
| mod - luascripts/commands/admin/punlock.lua | Diff File | |||
| mod - luascripts/commands/admin/setlevel.lua | Diff File | |||
| mod - luascripts/commands/admin/showhistory.lua | Diff File | |||
| mod - luascripts/commands/admin/stats.lua | Diff File | |||
| mod - luascripts/commands/admin/vmute.lua | Diff File | |||
| mod - luascripts/commands/admin/vunmute.lua | Diff File | |||
| mod - luascripts/commands/admin/warn.lua | Diff File | |||
| mod - luascripts/commands/client/pm.lua | Diff File | |||
| mod - luascripts/commands/commands.lua | Diff File | |||
| mod - luascripts/db/sqlite3.lua | Diff File | |||
| mod - luascripts/main.lua | Diff File | |||
| mod - luascripts/util/files.lua | Diff File | |||
| mod - luascripts/util/settings.lua | Diff File | |||
