diff options
| author | Mohammad Akhlaghi <mohammad@akhlaghi.org> | 2020-05-01 22:36:45 +0100 |
|---|---|---|
| committer | Mohammad Akhlaghi <mohammad@akhlaghi.org> | 2020-05-01 22:36:45 +0100 |
| commit | df878cc2dc80ea09e09617949869ab7044d3c3c3 (patch) | |
| tree | 4ffb0d73d6e6b3403d01923b94b27628f566398e /.gitattributes | |
| parent | a6f5fcd6177b8f6319ffccddda1627f8b1dad415 (diff) | |
| parent | 82666074e0c921e53c21b9e2c444e9a2d407d092 (diff) | |
Imported recent changes in Maneage, minor conflicts fixed
A few small conflicts showed up here and there. They are fixed with this
merge.
Diffstat (limited to '.gitattributes')
0 files changed, 0 insertions, 0 deletions