summaryrefslogtreecommitdiffstats
path: root/vendor/google.golang.org/protobuf/internal/impl/merge.go
Commit message (Expand)AuthorAgeFilesLines
* Update dependencies (#1521)Wim2021-06-161-3/+3
* Use mattermost v5 module (#1192)Wim2020-08-101-0/+176