projects / clearscm.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a4bfcbd 8a31102)
Merge branch 'master' of git+ssh://github.com/adefaria/clearscm
authorAndrew DeFaria <Andrew@DeFaria.com>
Fri, 1 Mar 2019 00:16:04 +0000 (17:16 -0700)
committerAndrew DeFaria <Andrew@DeFaria.com>
Fri, 1 Mar 2019 00:16:04 +0000 (17:16 -0700)
Conflicts:
web/Resumes/Andrew/ResumeLong.php


Trivial merge
ClearSCM Source Repository. Note parts of this repo are under GPL. Other parts are copyright ClearSCM, Inc.