projects / swc-setup-installation-test.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 655bea2 3f293fc)
Merge branch 'master' into bc-namespaced
authorW. Trevor King <wking@tremily.us>
Mon, 21 Apr 2014 21:24:57 +0000 (14:24 -0700)
committerW. Trevor King <wking@tremily.us>
Mon, 21 Apr 2014 21:24:57 +0000 (14:24 -0700)
* master:
  README.md: Convert 'boot camp' -> 'workshop'

1  2 
setup/README.md patch | diff1 | diff2 | blob | history

diff --cc setup/README.md
Simple merge
Automatically test student installations and help with troubleshooting