Skip to content
Commit cb730b47 authored by nimrod's avatar nimrod
Browse files

Merge branch 'master' of cgit.shore.co.il:/srv/git/rcfiles 

# Conflicts:
#	.bashrc
parents da21b9c0 ddb1dde9
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment