projects / clearscm.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4b00fc2 8e8e34a)
Merge branch 'master' of defaria.com:/opt/git/clearscm
authorAndrew DeFaria <adefaria@adefaria-lt.audience.local>
Mon, 5 May 2014 18:30:37 +0000 (11:30 -0700)
committerAndrew DeFaria <adefaria@adefaria-lt.audience.local>
Mon, 5 May 2014 18:30:37 +0000 (11:30 -0700)
Conflicts:
clearadm/etc/conf.d/clearadm.conf


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