Matthias Beyer e39bd7fc72 Merge branch 'fix-flag-forwarding' ... Conflicts were handled manually. Signed-off-by: Matthias Beyer <mail@beyermatthias.de>		2018-11-01 00:09:54 +01:00
..
core	Merge branch 'fix-flag-forwarding'	2018-11-01 00:09:54 +01:00
domain	imag-todo: Move from error-chain to failure	2018-10-30 18:46:29 +01:00