Skip to content
Commit db90589c authored by Tristan Carel's avatar Tristan Carel
Browse files

Merge remote-tracking branch 'upstream/master' into emacs 

Conflicts:
	plugins/emacs/emacs.plugin.zsh
	plugins/emacs/emacsclient.sh
parents 7066bf7c 57f04b92
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