From: Dylan Lloyd <dylan@dylansserver.com>
Date: Tue, 21 Feb 2012 21:55:29 +0000 (-0500)
Subject: Merge branch 'dev' into live
X-Git-Url: https://disinclined.org/git/?a=commitdiff_plain;h=181479aaed82024ced8a09ed6c92acb0d765626f;hp=442299dbfdd1babce99d344b1791fb693e45c61a;p=dylansserver.git

Merge branch 'dev' into live
---

diff --git a/.htaccess b/.htaccess
index 9bd010b..dc5f0ab 100644
--- a/.htaccess
+++ b/.htaccess
@@ -3,6 +3,8 @@ ErrorDocument 404 /404.php
 
 RewriteEngine on
 
+RewriteRule ^resume$ /res.pdf [L]
+
 RewriteRule ^notes/rss/?$ /index.php?rss=true [L]
 
 RewriteRule ^git/?$ /git/gitweb.cgi%{REQUESTURI} [L]