diff options
| author | Mohammad Akhlaghi <mohammad@akhlaghi.org> | 2020-04-02 15:51:28 +0100 |
|---|---|---|
| committer | Mohammad Akhlaghi <mohammad@akhlaghi.org> | 2020-04-02 16:05:03 +0100 |
| commit | de3842a14e36b2debb3ad375d95411d15d45dc84 (patch) | |
| tree | 86ae571f85c639c616cf8939cbcec7f1c1be4c9c /.file-metadata | |
| parent | 646756675566a0907edf143c6b6950e0479d9e7e (diff) | |
| parent | cbf177e09af6b9d240388d148b0cb5e3488d8b09 (diff) | |
Imported recent work on Maneage, minor conflicts fixed
A few minor conflicts occurred and were fixed.
Diffstat (limited to '.file-metadata')
| -rw-r--r-- | .file-metadata | bin | 7763 -> 7813 bytes |
1 files changed, 0 insertions, 0 deletions
diff --git a/.file-metadata b/.file-metadata Binary files differindex ca6abc5..0daa3df 100644 --- a/.file-metadata +++ b/.file-metadata |