Merge /users/jy2wong/www/rofl/dweb
authorJacob Parker <j3parker@csclub.uwaterloo.ca>
Thu, 23 Feb 2012 07:40:45 +0000 (02:40 -0500)
committerJacob Parker <j3parker@csclub.uwaterloo.ca>
Thu, 23 Feb 2012 07:40:45 +0000 (02:40 -0500)
Conflicts:
.gitignore
.htaccess
pub/style/style.css
src/web.d

1  2 
.gitignore

diff --cc .gitignore
@@@ -1,2 -1,2 +1,3 @@@
+ srv/*
  bin/web
 +.nfs*