Matthias Beyer c115215fa4 Merge branch 'master' into libimagerror/integration ... 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.		2017-09-04 23:02:45 +02:00
..
imag-bookmark	Remove tagging support	2017-09-02 10:16:55 +02:00
imag-counter	Fix readme links in cargo metadata	2017-09-01 18:48:02 +02:00
imag-diary	Merge branch 'master' into libimagerror/integration	2017-09-04 23:02:45 +02:00
imag-mail	Merge branch 'master' into libimagerror/integration	2017-09-04 23:02:45 +02:00
imag-notes	Remove tagging functionality from imag-notes	2017-09-02 10:16:56 +02:00
imag-timetrack	Fix readme links in cargo metadata	2017-09-01 18:48:02 +02:00
imag-todo	Merge pull request #1029 from matthiasbeyer/all-extensions-as-traits	2017-09-04 21:59:54 +02:00