Merge branch 'master' of https://github.com/j3parker/dweb
authorJennifer Yeelam Wong <jy2wong@corn-syrupcorn-syrup.(none)>
Thu, 23 Feb 2012 07:36:05 +0000 (02:36 -0500)
committerJennifer Yeelam Wong <jy2wong@corn-syrupcorn-syrup.(none)>
Thu, 23 Feb 2012 07:36:05 +0000 (02:36 -0500)
Conflicts:
pub/style/style.css

1  2 
.gitignore
.htaccess
pub/style/style.css

diff --cc .gitignore
@@@ -1,3 -1,3 +1,2 @@@
--pub/*
  srv/*
  bin/web
diff --cc .htaccess
+++ b/.htaccess
@@@ -1,4 -1,4 +1,4 @@@
  RewriteEngine on
--RewriteBase /~j3parker/
++RewriteBase /~jy2wong/rofl/dweb/
  RewriteRule ^pub/(.*) - [L]
--RewriteRule ^(.*) /users/j3parker/www/bin/web [L]
++RewriteRule ^(.*) /users/jy2wong/www/rofl/dweb/bin/web [L]
Simple merge