Skip to content
Commit 2595484a authored by Sébastien M-B's avatar Sébastien M-B
Browse files

Merge remote-tracking branch 'upstream/master' 

Conflicts:
	lib/aliases.zsh
parents 8d23a361 6e6cf430
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment