Ruin0x11 7305e8c60d Merge remote-tracking branch 'upstream/master' into localization ... # Conflicts: # .gitignore # guide/src/en/cli/completions.md # guide/src/en/format/images/rust-logo-blk.svg # guide/src/en/format/markdown.md # guide/src/en/misc/introduction.md # src/renderer/html_handlebars/hbs_renderer.rs # src/utils/mod.rs		2022-02-25 14:15:16 -08:00
..
en	Merge remote-tracking branch 'upstream/master' into localization	2022-02-25 14:15:16 -08:00
guide	Update documentation	2021-12-19 20:26:37 -08:00