Merge branch 'master' of ../www.fuck
authorJacob Parker <j3parker@csclub.uwaterloo.ca>
Fri, 24 Feb 2012 21:35:34 +0000 (16:35 -0500)
committerJacob Parker <j3parker@csclub.uwaterloo.ca>
Fri, 24 Feb 2012 21:35:34 +0000 (16:35 -0500)
Conflicts:
.gitignore
src/config.d.sample

1  2 
.gitignore
src/web.d

diff --cc .gitignore
@@@ -1,3 -1,5 +1,5 @@@
 -pub/*
  srv/*
  bin/web
 +.nfs*
+ .htaccess
+ src/config.d
diff --cc src/web.d
Simple merge