Matthias Beyer
c115215fa4
This merge solved a _LOT_ of conflicts and was a rather complicated one, as parts of the conflict-resolution involved rewriting of half the stuff. This merge commit fixes all the things so a `cargo check --all` succeeds, but I did not yet check whether tests run without failure. |
||
|---|---|---|
| .. | ||
| libimagentryannotation | ||
| libimagentrycategory | ||
| libimagentrydatetime | ||
| libimagentryedit | ||
| libimagentryfilter | ||
| libimagentrygps | ||
| libimagentrylink | ||
| libimagentrylist | ||
| libimagentrymarkdown | ||
| libimagentryref | ||
| libimagentrytag | ||
| libimagentryview | ||