| commit | df3e687925f0d2967d27433ee50584c54eca6ad1 | [log] [tgz] |
|---|---|---|
| author | Marco Miller <marco.miller@ericsson.com> | Thu Nov 26 17:11:55 2020 -0500 |
| committer | Marco Miller <marco.miller@ericsson.com> | Thu Nov 26 17:11:55 2020 -0500 |
| tree | 31594ee6baf81fcf20499f29b3d4e9300c8cde4c | |
| parent | 84af896c854e6c4175cb79130ac7c0145d5a69f7 [diff] | |
| parent | 2acbabd76641ee8011c437cd9818305ffee2b21e [diff] |
Merge branch 'stable-3.1' into stable-3.2 * stable-3.1: Remove no longer applicable .mailmap file contents Change-Id: I63c006a6245bdc026ad54d8213b2d251c9708acf
diff --git a/.mailmap b/.mailmap deleted file mode 100644 index 84de0f3..0000000 --- a/.mailmap +++ /dev/null
@@ -1 +0,0 @@ -Hector Oswaldo Caballero <hector.caballero@ericsson.com>