aboutsummaryrefslogtreecommitdiff
path: root/.file-metadata
diff options
context:
space:
mode:
authorMohammad Akhlaghi <mohammad@akhlaghi.org>2021-01-03 15:24:08 +0000
committerMohammad Akhlaghi <mohammad@akhlaghi.org>2021-01-03 15:24:08 +0000
commitdaeb41ba00427d28e22169381bc21b1ad784d087 (patch)
tree8a3267559a0f5c8dc63fae16ae2bc65d8ab6715e /.file-metadata
parent281ad23c2218560bcdfe3e76cf61f4901f76b257 (diff)
parentb1bd282bc3bcd11573fc064edfbab1bd65564348 (diff)
Imported recent updates in Maneage, minor conflicts fixed
There were only three very small conflicts that have been fixed.
Diffstat (limited to '.file-metadata')
0 files changed, 0 insertions, 0 deletions