Commit Graph

1 Commits

Author SHA1 Message Date
John Mertz 914a95d622 Merge branch 'master' of ssh://git@git.john.me.tz:223/jpm/.dotfiles.git
Conflicts:
	bash/bashrc.host
	sway/autostart
2023-07-16 14:46:10 -04:00