Merge remote-tracking branch 'upstream/master'

Browse source

# Conflicts:
#	templates/zshrc.zsh-template

...

This commit is contained in:

Gaetan Semet 2016-12-13 19:34:09 +01:00

parent 04117e2a8d 26aae6b583

commit 87ce7d58e6

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

Diff content is not available