Merge remote-tracking branch 'upstream/develop' into no-author-link
authorMichael <heluecht@pirati.ca>
Sat, 16 Jun 2018 15:37:54 +0000 (15:37 +0000)
committerMichael <heluecht@pirati.ca>
Sat, 16 Jun 2018 15:37:54 +0000 (15:37 +0000)
commit6f9ec690aaa8e8a4ef4a487f2755cf68cee4b052
tree9219482bb0f7e7f74b7b74070c05a0391ea6f319
parentabef0cd46c601fa66c06068a4c41c8e556681f19
parent7d1bb9ecf482874155695488ba54021ce0200f5c
Merge remote-tracking branch 'upstream/develop' into no-author-link