diff options
| author | Mohammad Akhlaghi <mohammad@akhlaghi.org> | 2021-04-17 04:55:58 +0100 |
|---|---|---|
| committer | Mohammad Akhlaghi <mohammad@akhlaghi.org> | 2021-04-17 04:55:58 +0100 |
| commit | d11725a09133a422dbad19f46caa088bd0bca3a9 (patch) | |
| tree | 94ec18b1ff1324837888e3b16025c835f7958f5b /.gitignore | |
| parent | 30bf4624adf40e9611ad8f6a0214e725b2ea88af (diff) | |
| parent | 6e4ec9a305f7021643fe22e08fe0ad17dd363a93 (diff) | |
Imported recent work in Maneage, minor conflicts fixed
Some minor conflicts (all expected from the commit messages in the Maneage
branch) occurred but were easily fixed.
Diffstat (limited to '.gitignore')
0 files changed, 0 insertions, 0 deletions