summaryrefslogtreecommitdiff
path: root/.mailmap
diff options
context:
space:
mode:
authorSam Bingner <sam@bingner.com>2021-03-13 01:03:46 -1000
committerSam Bingner <sam@bingner.com>2021-03-13 01:03:46 -1000
commit9d8383bdee9f1ddc5685c36678b1ca033cbea971 (patch)
tree5dcc8c91e9c0a1b85ef15654a1cf58e7869753c5 /.mailmap
parent11cd82291bb7a02cafbb271c8416f8b59e1f1413 (diff)
parent95e417cb069928dfdb5dfacb418f025d71f32c4d (diff)
Merge remote-tracking branch 'upstream/1.8.2.z' into 1.8.2.z+ios1.8.2.z+ios
Diffstat (limited to '.mailmap')
0 files changed, 0 insertions, 0 deletions