From: Andrew DeFaria <Andrew@DeFaria.com>
Date: Fri, 1 Mar 2019 00:16:04 +0000 (-0700)
Subject: Merge branch 'master' of git+ssh://github.com/adefaria/clearscm
X-Git-Url: https://defaria.com/gitweb/?a=commitdiff_plain;h=4a16bbdf7cc4455d540a742d143976a632142c24;p=clearscm.git

Merge branch 'master' of git+ssh://github.com/adefaria/clearscm

Conflicts:
	web/Resumes/Andrew/ResumeLong.php
---

4a16bbdf7cc4455d540a742d143976a632142c24