commit 981a3240273da369912ffb6bae59acfcc7a0d0ef parent a4550e51ea2425e65c6aab7118398a349301acf5 Author: Daniel GarcĂa <dani-garcia@users.noreply.github.com> Date: Mon, 19 Nov 2018 20:30:19 +0100 Merge branch 'master' into rocket-0.4 # Conflicts: # src/api/core/mod.rs