aboutsummaryrefslogtreecommitdiff
path: root/.file-metadata
diff options
context:
space:
mode:
authorMohammad Akhlaghi <mohammad@akhlaghi.org>2021-01-04 03:47:07 +0000
committerMohammad Akhlaghi <mohammad@akhlaghi.org>2021-01-04 03:47:07 +0000
commit402070be9b15e731f463be1758ca8eaab56cd7cc (patch)
tree4c94373cf3f3b8dc229b06b78417bddc3acdbaf6 /.file-metadata
parent624ccc1326a5b9e86561bedcb97a9f04851e7067 (diff)
parenta1a966a598eb3693463aa5b0153f37ba22cfee6d (diff)
Imported recent updates in Maneage, no conflicts
There weren't any conflicts in this merge; either technical conflicts that can be found by Git, or logical conflicts (that will cause a crash in the project).
Diffstat (limited to '.file-metadata')
0 files changed, 0 insertions, 0 deletions