matthiasbeyer/imag - imag - git.join-lemmy.org

matthiasbeyer

imag

Fork 0

Commit Graph

Author	SHA1	Message	Date
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
Matthias Beyer	72ea21ee1f	Rename module task -> taskstore	2017-09-04 09:20:14 +02:00

Author

SHA1

Message

Date

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

Matthias Beyer

72ea21ee1f

Rename module task -> taskstore

2017-09-04 09:20:14 +02:00

2 Commits