diff options
| author | Mohammad Akhlaghi <mohammad@akhlaghi.org> | 2020-08-17 00:28:08 +0100 |
|---|---|---|
| committer | Mohammad Akhlaghi <mohammad@akhlaghi.org> | 2020-08-20 02:00:32 +0100 |
| commit | 3480a74b077f599389fd54a453791a0373568171 (patch) | |
| tree | 76e472534d729301ad480e3777c91a7c24a5d331 /.gitignore | |
| parent | b79c430c82b6c3a40817caac13bf8665cfa9c6a3 (diff) | |
| parent | 9573d4e4d4754e629b73be4bd6846a049d57f427 (diff) | |
Imported recent updates in Maneage, minor conflicts fixed
Some very minor conflicts came up and were easily corrected. They were
mostly in parts that are also shared with the demonstration in the core
Maneage branch.
Diffstat (limited to '.gitignore')
0 files changed, 0 insertions, 0 deletions