diff options
| author | elijah <elijah@riseup.net> | 2015-10-05 09:48:29 -0700 |
|---|---|---|
| committer | elijah <elijah@riseup.net> | 2015-10-05 09:48:29 -0700 |
| commit | 133ba7d5af1659458996ef4f2d1cb8919b438394 (patch) | |
| tree | 0bab77eee78d6d453e2c260fed6f2bdb137a567f /.mailmap | |
| parent | da12768b873e17af261f7fd69aec7d86255fa6e5 (diff) | |
| parent | afd8867ba953513c6e08f957e3099f0ff3b1a3a2 (diff) | |
Merge branch 'bugfix/virtualaliases' into develop
Diffstat (limited to '.mailmap')
0 files changed, 0 insertions, 0 deletions