Merge remote-tracking branch 'upstream/develop' into daemon
authorMichael <heluecht@pirati.ca>
Sat, 2 Jun 2018 04:03:55 +0000 (04:03 +0000)
committerMichael <heluecht@pirati.ca>
Sat, 2 Jun 2018 04:03:55 +0000 (04:03 +0000)
commit6d64667cdb02af0f3f6393f14c253ac9dcada1d9
tree985938134772ad5eee7876a52c5398f57a6b0db9
parent28f8beebfc147fdcf14afcf8d56e8888dfbc0f0d
parent33c943a9dd2d34b3f95f5020bc4835eefe76cf24
Merge remote-tracking branch 'upstream/develop' into daemon