github/bettercap
1
0
Fork 0
mirror of https://github.com/bettercap/bettercap synced 2025-08-21 05:53:20 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

merge

Browse source
This commit is contained in:
Simone Margaritelli 2019-09-28 17:43:31 +02:00
commit 8c424765f6
2 changed files with 3 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
core/banner.go
View file

@ -2,7 +2,7 @@ package core
const ( const (
Name = "bettercap" Name = "bettercap"
Version = "2.24.1" Version = "2.25"
Author = "Simone 'evilsocket' Margaritelli" Author = "Simone 'evilsocket' Margaritelli"
Website = "https://bettercap.org/" Website = "https://bettercap.org/"
) )

2
network/meta.go
View file

@ -29,6 +29,8 @@ func NewMeta() *Meta {
} }
func (m *Meta) MarshalJSON() ([]byte, error) { func (m *Meta) MarshalJSON() ([]byte, error) {
m.Lock()
defer m.Unlock()
return json.Marshal(metaJSON{Values: m.m}) return json.Marshal(metaJSON{Values: m.m})
} }