projects / clearscm.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: fbfd2db 758be15)
Merge branch 'master' of /opt/git/clearscm
authorAndrew DeFaria <Andrew@DeFaria.com>
Tue, 4 Aug 2015 19:49:35 +0000 (12:49 -0700)
committerAndrew DeFaria <Andrew@DeFaria.com>
Tue, 4 Aug 2015 19:49:35 +0000 (12:49 -0700)
Conflicts:
web/Resumes/Andrew/index.php


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